curtin-dev team mailing list archive
-
curtin-dev team
-
Mailing list archive
-
Message #02072
[Merge] ~mwhudson/curtin:no-py2 into curtin:master
Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:no-py2 into curtin:master.
Commit message:
Stop running CI against Python 2
We are going to stop supporting Python 2 in future
development. There is plenty more stuff we can rip out as a
consequence of this but dropping it from CI is the first step and
unblocks other changes.
Requested reviews:
curtin developers (curtin-dev)
For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/415225
--
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:no-py2 into curtin:master.
diff --git a/tox.ini b/tox.ini
index d9437c5..3e86c7a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,12 +3,9 @@ minversion = 1.6
skipsdist = True
envlist =
py3-flake8,
- py27,
py3,
py3-pyflakes,
py3-pylint,
- py27-pylint,
- trusty-py27,
block-schema,
xenial-py3
@@ -31,23 +28,6 @@ commands = {envpython} {toxinidir}/tools/noproxy {envpython} -m nose \
basepython = python3
sitepackages = true
-[testenv:py27]
-basepython = python2.7
-sitepackages = true
-# https://github.com/pypa/setuptools/issues/1963
-deps = {[testenv]deps}
- setuptools<45
-
-# tox uses '--pre' by default to pip install. We don't want that, and
-# 'pip_pre=False' isn't available until tox version 1.9.
-install_command = pip install {opts} {packages}
-
-[testenv:py2-flake8]
-basepython = python2
-deps = {[testenv]deps}
- flake8
-commands = {envpython} -m flake8 {posargs:curtin}
-
[testenv:py3-flake8]
basepython = python3
deps = {[testenv]deps}
@@ -68,15 +48,6 @@ deps = {[testenv]deps}
git+https://git.launchpad.net/simplestreams
commands = {envpython} -m pylint --errors-only {posargs:curtin tests/vmtests}
-[testenv:py27-pylint]
-# set basepython because tox 1.6 (trusty) does not support generated environments
-basepython = python2.7
-sitepackages = true
-deps = {[testenv]deps}
- {[testenv:py27]deps}
- pylint==1.8.1
-commands = {envpython} -m pylint --errors-only {posargs:curtin}
-
[testenv:docs]
deps = {[testenv]deps}
sphinx
@@ -107,15 +78,6 @@ basepython = python3
commands =
{toxinidir}/tools/run-pyflakes3 {posargs}
-[testenv:trusty-py27]
-deps = {[testenv:trusty]deps}
- setuptools<45
-
-basepython = python2.7
-sitepackages = true
-commands = {envpython} {toxinidir}/tools/noproxy {envpython} -m nose \
- {posargs:tests/unittests}
-
[testenv:trusty-py3]
deps = {[testenv:trusty]deps}
basepython = python3
@@ -129,13 +91,6 @@ deps =
pyyaml==3.11
oauthlib==1.0.3
-[testenv:xenial-py27]
-basepython = python27
-deps = {[testenv:xenial]deps}
- {[testenv:py27]deps}
-commands = {envpython} {toxinidir}/tools/noproxy {envpython} -m nose \
- {posargs:tests/unittests}
-
[testenv:xenial-py3]
basepython = python3
sitepackages = true
Follow ups