diff --git a/.zuul.yaml b/.zuul.yaml index 3889212..fd189e2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,3 @@ - project: templates: - - python-charm-jobs - openstack-python3-ussuri-jobs diff --git a/setup.py b/setup.py index eadb9ff..14f66ac 100644 --- a/setup.py +++ b/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', diff --git a/tox.ini b/tox.ini index b9b5921..58d452c 100644 --- a/tox.ini +++ b/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