1
0
Fork 0

tox: Assume that Python 3 is the default interpreter

This change affects existing development environments which will have
to be recreated with the Python 3 interpreter as the default.

Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
merge-requests/411/head
Vasilis Tsiligiannis 2019-09-02 01:10:47 +03:00
parent b288a1249d
commit 572ac24d44
2 changed files with 8 additions and 8 deletions

View File

@ -21,7 +21,7 @@ static:
before_script:
- pip install tox~=3.8.0
script:
- tox -e "py3-flake8,isort,yapf,py3-pylint"
- tox -e "flake8,isort,yapf,pylint"
docs:
stage: build
image: python:3
@ -42,7 +42,7 @@ build:
- pip install tox~=3.8.0
script:
- rm -rf dist
- tox -e py3-build
- tox -e build
artifacts:
expire_in: 1 week
when: always
@ -54,7 +54,7 @@ test:
before_script:
- pip install tox~=3.8.0
script:
- tox -e deps,py3-pytest
- tox -e deps,pytest
docker:
stage: deploy
image: docker:18.09

10
tox.ini
View File

@ -1,7 +1,7 @@
[tox]
envlist = py3-flake8,isort,yapf,py3-{pylint,build}
envlist = flake8,isort,yapf,pylint,build
[testenv:py3-flake8]
[testenv:flake8]
deps =
flake8==3.7.7
skip_install = True
@ -29,12 +29,12 @@ deps =
skip_install = True
commands = yapf -i -r .
[testenv:py3-build]
[testenv:build]
skip_install = True
commands =
python setup.py sdist bdist_wheel
[testenv:py3-pylint]
[testenv:pylint]
deps =
pylint==2.3.1
pylint-django==2.0.9
@ -51,7 +51,7 @@ deps =
extras = dev
commands = pip check
[testenv:py3-pytest]
[testenv:pytest]
install_command = python -m pip install --no-deps {opts} {packages}
deps =
-rrequirements-dev.txt