Merge "Stop supporting python2" into feature/zuulv3
This commit is contained in:
commit
9eea582723
@ -5,6 +5,5 @@
|
||||
- tox-docs
|
||||
- tox-cover
|
||||
- tox-linters
|
||||
- tox-py27
|
||||
- tox-py35
|
||||
- tox-tarball
|
||||
|
@ -12,9 +12,8 @@ classifier =
|
||||
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
|
||||
|
4
tox.ini
4
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 @@ commands = bindep test
|
||||
|
||||
[testenv:pep8]
|
||||
# streamer is python3 only, so we need to run flake8 in python3
|
||||
basepython = python3
|
||||
commands = flake8 {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
|
@ -95,10 +95,11 @@ class Client(zuul.cmd.ZuulApp):
|
||||
'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'
|
||||
)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user