Merge "[ussuri][goal] Updates for python 2.7 drop"
This commit is contained in:
commit
aca9e41ed6
|
@ -1,4 +1,3 @@
|
|||
- project:
|
||||
templates:
|
||||
- python-charm-jobs
|
||||
- openstack-python3-ussuri-jobs
|
||||
|
|
4
setup.py
4
setup.py
|
@ -57,10 +57,10 @@ setup(
|
|||
"Topic :: System",
|
||||
"Topic :: System :: Installation/Setup",
|
||||
"Topic :: System :: Software Distribution",
|
||||
"Programming Language :: Python :: 2",
|
||||
"Programming Language :: Python :: 2.7",
|
||||
"Programming Language :: Python :: 3",
|
||||
"Programming Language :: Python :: 3.5",
|
||||
"Programming Language :: Python :: 3.6",
|
||||
"Programming Language :: Python :: 3.7",
|
||||
"License :: OSI Approved :: Apache Software License",
|
||||
],
|
||||
url='https://github.com/openstack-charmers/charms.openstack',
|
||||
|
|
7
tox.ini
7
tox.ini
|
@ -10,13 +10,6 @@ install_command =
|
|||
pip install {opts} {packages}
|
||||
commands = stestr run {posargs}
|
||||
|
||||
[testenv:py27]
|
||||
basepython = python2.7
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
# Py27 needs to be disabled as upstream charms.reactive is not Py3.5+ only
|
||||
# However, we can't yet remove the actually py27 test from the gate.
|
||||
commands = python -c "print('Py27 testing disabled.')" && /bin/true
|
||||
|
||||
[testenv:py3]
|
||||
basepython = python3
|
||||
deps = -r{toxinidir}/test-requirements.txt
|
||||
|
|
Loading…
Reference in New Issue