Merge ~mwhudson/curtin:no-py2 into curtin:master

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: 0d56c836aa4c0ea6c8e88613766c0ef85734e214
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~mwhudson/curtin:no-py2
Merge into: curtin:master
Diff against target: 87 lines (+0/-45)
1 file modified
tox.ini (+0/-45)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Dan Bungert Approve
Review via email: mp+415225@code.launchpad.net

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.

To post a comment you must log in.
Revision history for this message
Dan Bungert (dbungert) :
review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tox.ini b/tox.ini
2index d9437c5..3e86c7a 100644
3--- a/tox.ini
4+++ b/tox.ini
5@@ -3,12 +3,9 @@ minversion = 1.6
6 skipsdist = True
7 envlist =
8 py3-flake8,
9- py27,
10 py3,
11 py3-pyflakes,
12 py3-pylint,
13- py27-pylint,
14- trusty-py27,
15 block-schema,
16 xenial-py3
17
18@@ -31,23 +28,6 @@ commands = {envpython} {toxinidir}/tools/noproxy {envpython} -m nose \
19 basepython = python3
20 sitepackages = true
21
22-[testenv:py27]
23-basepython = python2.7
24-sitepackages = true
25-# https://github.com/pypa/setuptools/issues/1963
26-deps = {[testenv]deps}
27- setuptools<45
28-
29-# tox uses '--pre' by default to pip install. We don't want that, and
30-# 'pip_pre=False' isn't available until tox version 1.9.
31-install_command = pip install {opts} {packages}
32-
33-[testenv:py2-flake8]
34-basepython = python2
35-deps = {[testenv]deps}
36- flake8
37-commands = {envpython} -m flake8 {posargs:curtin}
38-
39 [testenv:py3-flake8]
40 basepython = python3
41 deps = {[testenv]deps}
42@@ -68,15 +48,6 @@ deps = {[testenv]deps}
43 git+https://git.launchpad.net/simplestreams
44 commands = {envpython} -m pylint --errors-only {posargs:curtin tests/vmtests}
45
46-[testenv:py27-pylint]
47-# set basepython because tox 1.6 (trusty) does not support generated environments
48-basepython = python2.7
49-sitepackages = true
50-deps = {[testenv]deps}
51- {[testenv:py27]deps}
52- pylint==1.8.1
53-commands = {envpython} -m pylint --errors-only {posargs:curtin}
54-
55 [testenv:docs]
56 deps = {[testenv]deps}
57 sphinx
58@@ -107,15 +78,6 @@ basepython = python3
59 commands =
60 {toxinidir}/tools/run-pyflakes3 {posargs}
61
62-[testenv:trusty-py27]
63-deps = {[testenv:trusty]deps}
64- setuptools<45
65-
66-basepython = python2.7
67-sitepackages = true
68-commands = {envpython} {toxinidir}/tools/noproxy {envpython} -m nose \
69- {posargs:tests/unittests}
70-
71 [testenv:trusty-py3]
72 deps = {[testenv:trusty]deps}
73 basepython = python3
74@@ -129,13 +91,6 @@ deps =
75 pyyaml==3.11
76 oauthlib==1.0.3
77
78-[testenv:xenial-py27]
79-basepython = python27
80-deps = {[testenv:xenial]deps}
81- {[testenv:py27]deps}
82-commands = {envpython} {toxinidir}/tools/noproxy {envpython} -m nose \
83- {posargs:tests/unittests}
84-
85 [testenv:xenial-py3]
86 basepython = python3
87 sitepackages = true

Subscribers

People subscribed via source and target branches