Merge "Stop supporting python2" into feature/zuulv3
diff --git a/.zuul.yaml b/.zuul.yaml
index c21b30f..e8b070f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,6 +5,5 @@
- tox-docs
- tox-cover
- tox-linters
- - tox-py27
- tox-py35
- tox-tarball
diff --git a/setup.cfg b/setup.cfg
index 5ae0903..0d22cb1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,9 +12,8 @@
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
- Programming Language :: Python :: 2
- Programming Language :: Python :: 2.7
- Programming Language :: Python :: 2.6
+ Programming Language :: Python :: 3
+ Programming Language :: Python :: 3.5
[pbr]
warnerrors = True
diff --git a/tox.ini b/tox.ini
index 9b97eca..a3f018f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
[tox]
minversion = 1.6
skipsdist = True
-envlist = pep8, py27
+envlist = pep8,py35
[testenv]
+basepython = python3
# Set STATSD env variables so that statsd code paths are tested.
setenv = STATSD_HOST=127.0.0.1
STATSD_PORT=8125
@@ -27,7 +28,6 @@
[testenv:pep8]
# streamer is python3 only, so we need to run flake8 in python3
-basepython = python3
commands = flake8 {posargs}
[testenv:cover]
diff --git a/zuul/cmd/client.py b/zuul/cmd/client.py
index d8250c5..94414f2 100644
--- a/zuul/cmd/client.py
+++ b/zuul/cmd/client.py
@@ -95,10 +95,11 @@
'running-jobs',
help='show the running jobs'
)
+ running_jobs_columns = list(self._show_running_jobs_columns().keys())
show_running_jobs.add_argument(
'--columns',
help="comma separated list of columns to display (or 'ALL')",
- choices=self._show_running_jobs_columns().keys().append('ALL'),
+ choices=running_jobs_columns.append('ALL'),
default='name, worker.name, start_time, result'
)