x/gerrit-dash-creator
Code Issues Proposed changes

Drop python 2

Browse Source 
Remove python 2 support, use python3 as basepython in tox everywhere.

Change-Id: I487ad8a7e1c30b60917c33ccefc337caf218484b
This commit is contained in:
Andreas Jaeger 2020-01-11 17:13:59 +01:00
parent ae37effc4a
commit 944a6187c7
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
setup.cfg
View File

@ -13,10 +13,9 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
[global] [global]
setup-hooks = setup-hooks =
@ -33,11 +32,3 @@ data_files =
console_scripts = console_scripts =
gerrit-dash-creator = gerrit_dash_creator.cmd.creator:main gerrit-dash-creator = gerrit_dash_creator.cmd.creator:main
gerrit-bug-dash = gerrit_dash_creator.cmd.bugs:main gerrit-bug-dash = gerrit_dash_creator.cmd.bugs:main
[build_sphinx]
source-dir = doc/source
build-dir = doc/build
all_files = 1
[upload_sphinx]
upload-dir = doc/build/html

11
tox.ini
View File

@ -1,11 +1,11 @@
[tox] [tox]
minversion = 1.6 minversion = 1.6
envlist = py36,py27,pypy,pep8,checksyntax,dashboards envlist = py36,pypy,pep8,checksyntax,dashboards
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython = python3
usedevelop = True usedevelop = True
install_command = pip install -U {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
@ -13,23 +13,18 @@ deps = -r{toxinidir}/requirements.txt
whitelist_externals = bash whitelist_externals = bash
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 commands = flake8
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:checksyntax] [testenv:checksyntax]
basepython = python3
commands = python gerrit_dash_creator/cmd/creator.py --check-only dashboards commands = python gerrit_dash_creator/cmd/creator.py --check-only dashboards
[testenv:cover] [testenv:cover]
basepython = python3
commands = python setup.py testr --coverage --testr-args='{posargs}' commands = python setup.py testr --coverage --testr-args='{posargs}'
[testenv:docs] [testenv:docs]
basepython = python3
commands = commands =
# not happy with generated dashboard pages # not happy with generated dashboard pages
# doc8 -e .rst doc CONTRIBUTING.rst HACKING.rst README.rst # doc8 -e .rst doc CONTRIBUTING.rst HACKING.rst README.rst
@ -45,13 +40,11 @@ builtins = _
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
[testenv:dashboards] [testenv:dashboards]
basepython = python3
commands = commands =
bash -c "tools/generate_dashboards.sh" bash -c "tools/generate_dashboards.sh"
sphinx-build -b html doc/source/ doc/build/html sphinx-build -b html doc/source/ doc/build/html
[testenv:bindep] [testenv:bindep]
basepython = python3
# Do not install any requirements. We want this to be fast and work even if # Do not install any requirements. We want this to be fast and work even if
# system dependencies are missing, since it's used to tell you what system # system dependencies are missing, since it's used to tell you what system
# dependencies are missing! This also means that bindep must be installed # dependencies are missing! This also means that bindep must be installed