diff --git a/.zuul.yaml b/.zuul.yaml index cfd5b33..410183b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,18 +6,15 @@ - publish-openstack-docs-pti check: jobs: - - monasca-tempest-python2-influxdb - monasca-tempest-python3-influxdb - - monasca-tempest-python2-cassandra + - monasca-tempest-python3-cassandra - monasca-tempest-log-python3-influxdb: voting: false - build-monasca-docker-image gate: queue: monasca jobs: - - monasca-tempest-python2-influxdb - monasca-tempest-python3-influxdb - - monasca-tempest-python2-cassandra post: jobs: - publish-monasca-tempest-plugin-docker-image diff --git a/releasenotes/notes/drop-py-2-7-e5ad0bf8a877580b.yaml b/releasenotes/notes/drop-py-2-7-e5ad0bf8a877580b.yaml new file mode 100644 index 0000000..73358a0 --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-e5ad0bf8a877580b.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of monasca-tempest-plugin + to support py2.7 is OpenStack Train. The minimum version of Python now + supported by monasca-tempest-plugin is Python 3.5. diff --git a/setup.cfg b/setup.cfg index 1c57350..b8d88a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,10 +13,10 @@ 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 :: 3 Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 Topic :: System :: Monitoring [files] diff --git a/test-requirements.txt b/test-requirements.txt index 84cb457..1b760eb 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,8 +4,7 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD openstackdocstheme>=1.20.0 # Apache-2.0 # releasenotes reno>=2.5.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 5b2cbc5..fe448a8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,11 @@ [tox] -minversion = 2.0 -envlist = py27,py35,pypy,pep8 +minversion = 3.1.1 +envlist = py37,pypy,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] +basepython = python3 usedevelop = True install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} setenv = @@ -16,15 +18,12 @@ deps = -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} [testenv:pep8] -basepython = python3 commands = flake8 {posargs} [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 setenv = VIRTUAL_ENV={envdir} PYTHON=coverage run --source monasca_tempest_plugin --parallel-mode @@ -35,16 +34,13 @@ commands = coverage xml -o cover/coverage.xml [testenv:docs] -basepython = python3 commands = python setup.py build_sphinx [testenv:releasenotes] -basepython = python3 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:debug] -basepython = python3 commands = oslo_debug_helper {posargs} [flake8]