Skip to content

Commit

Permalink
fix all test errors
Browse files Browse the repository at this point in the history
  • Loading branch information
gijzelaerr committed Jul 20, 2018
1 parent 022a3f3 commit 0425935
Show file tree
Hide file tree
Showing 41 changed files with 149 additions and 286 deletions.
5 changes: 3 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
.gitignore
.idea
.ipynb_checkpoints
.virtualenv/
.virtualenv3/
.virtualenv*/
.venv*/
.tox
tmp
build
dist
*.egg-info/
.eggs/
doc/_build/
14 changes: 4 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,17 @@ matrix:
- env: DIST=centos_7_py2
- env: DIST=debian_jessie_py2
- env: DIST=debian_jessie_py3
- env: DIST=fedora_25_py2
- env: DIST=fedora_25_py3
- env: DIST=fedora_26_py2
- env: DIST=fedora_26_py3
- env: DIST=fedora_27_py2
- env: DIST=fedora_27_py3
- env: DIST=fedora_28_py2
- env: DIST=fedora_28_py3
- env: DIST=fedora_25_rpm
- env: DIST=fedora_26_rpm
- env: DIST=fedora_27_rpm
- env: DIST=fedora_28_rpm
- env: DIST=ubuntu_xenial_py2
- env: DIST=ubuntu_xenial_py3
- env: DIST=ubuntu_xenial_doc
- env: DIST=ubuntu_artful_py2
- env: DIST=ubuntu_artful_py3
- env: DIST=ubuntu_bionic_py2
- env: DIST=ubuntu_bionic_py3
- env: DIST=ubuntu_bionic_py3_pep8
- env: DIST=ubuntu_bionic_doc
sudo: required
services:
- docker
Expand All @@ -44,3 +35,6 @@ deploy:
tags: true
distributions: sdist bdist_wheel
repo: eduvpn/python-eduvpn-client
notifications:
email:
on_fail: always
7 changes: 5 additions & 2 deletions docker/Dockerfile.centos_7_py2
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ RUN yum install -y \
python2-dateutil \
python2-mock \
python2-pip \
python2-cryptography \
python-qrcode \
python-pillow \
pytest


ADD . /code
WORKDIR /code
RUN pip install --upgrade setuptools
RUN pip install --upgrade setuptools pip
RUN pip install .
RUN py.test
RUN py.test -vv
3 changes: 3 additions & 0 deletions docker/Dockerfile.centos_7_rpm
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ RUN yum install -y \
python2-requests-oauthlib \
python2-mock \
python2-pytest-runner \
python2-cryptography \
python-qrcode \
python-pillow \
gcc

# GCC is required for the test run that will compile and install pynacl manually
Expand Down
5 changes: 4 additions & 1 deletion docker/Dockerfile.debian_jessie_py2
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ RUN docker-apt-install \
python-pip \
python-mock \
python-repoze.lru \
python-pytest
python-pytest \
python-cryptography \
python-qrcode \
python-pillow

ADD . /code
WORKDIR /code
Expand Down
5 changes: 4 additions & 1 deletion docker/Dockerfile.debian_jessie_py3
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ RUN docker-apt-install \
python3-dateutil \
python3-mock \
python3-repoze.lru \
python3-pytest
python3-pytest \
python3-cryptography \
python3-qrcode \
python3-pillow


ADD . /code
Expand Down
20 changes: 0 additions & 20 deletions docker/Dockerfile.fedora_25_py2

This file was deleted.

19 changes: 0 additions & 19 deletions docker/Dockerfile.fedora_25_py3

This file was deleted.

43 changes: 0 additions & 43 deletions docker/Dockerfile.fedora_25_rpm

This file was deleted.

20 changes: 0 additions & 20 deletions docker/Dockerfile.fedora_26_py2

This file was deleted.

19 changes: 0 additions & 19 deletions docker/Dockerfile.fedora_26_py3

This file was deleted.

43 changes: 0 additions & 43 deletions docker/Dockerfile.fedora_26_rpm

This file was deleted.

5 changes: 4 additions & 1 deletion docker/Dockerfile.fedora_27_py2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ RUN dnf install -y \
python2-future \
python2-dateutil \
python2-mock \
python2-pytest
python2-pytest \
python2-cryptography \
python-qrcode \
python2-pillow

ADD . /code
WORKDIR /code
Expand Down
5 changes: 4 additions & 1 deletion docker/Dockerfile.fedora_27_py3
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ RUN dnf install -y \
python3-future \
python3-dateutil \
python3-mock \
python3-pytest
python3-pytest \
python3-cryptography \
python3-qrcode \
python3-pillow

ADD . /code
WORKDIR /code
Expand Down
11 changes: 7 additions & 4 deletions docker/Dockerfile.fedora_27_rpm
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,31 @@ RUN dnf install -y \

gtk3 \
libnotify \

python2-devel \
python-gobject \
python2-configparser \
python2-future \
python2-pynacl \
python2-requests-oauthlib \
python2-cryptography \
python2-qrcode \
python2-pillow
python-repoze-lru \
dbus-python \

python3-devel \
python3-future \
python3-gobject \
python3-pynacl \
python3-requests-oauthlib \
python3-dbus \
python3-repoze-lru \

pytest \
python2-mock \
python2-pytest-runner \
python3-pytest-runner
python3-pytest-runner \
python3-cryptography \
python3-qrcode \
python3-pillow

RUN rpmdev-setuptree

Expand Down
5 changes: 4 additions & 1 deletion docker/Dockerfile.fedora_28_py2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ RUN dnf install -y \
python2-future \
python2-dateutil \
python2-mock \
python2-pytest
python2-pytest \
python2-cryptography \
python2-qrcode \
python2-pillow

ADD . /code
WORKDIR /code
Expand Down
5 changes: 4 additions & 1 deletion docker/Dockerfile.fedora_28_py3
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ RUN dnf install -y \
python3-future \
python3-dateutil \
python3-mock \
python3-pytest
python3-pytest \
python3-cryptography \
python3-qrcode \
python3-pillow

ADD . /code
WORKDIR /code
Expand Down
8 changes: 7 additions & 1 deletion docker/Dockerfile.fedora_28_rpm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ RUN dnf install -y \
python2-future \
python2-pynacl \
python2-requests-oauthlib \
python2-cryptography \
python2-qrcode \
python2-pillow \
python-repoze-lru \
dbus-python \
python3-devel \
Expand All @@ -24,7 +27,10 @@ RUN dnf install -y \
python2-mock \
python3-mock \
python2-pytest-runner \
python3-pytest-runner
python3-pytest-runner \
python3-cryptography \
python3-qrcode \
python3-pillow

RUN rpmdev-setuptree

Expand Down
Loading

0 comments on commit 0425935

Please sign in to comment.