diff --git a/.zuul.yaml b/.zuul.yaml index b0beac3..83c03c0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -22,6 +22,8 @@ vars: tox_envlist: all tempest_test_regex: monasca_tempest_tests.tests.event_api + devstack_localrc: + USE_PYTHON3: true devstack_plugins: monasca-api: https://opendev.org/openstack/monasca-api monasca-log-api: https://opendev.org/openstack/monasca-log-api @@ -33,13 +35,6 @@ - ^doc/.*$ - ^releasenotes/.*$ -- job: - name: monasca-events-python2 - parent: monasca-events-tempest-base - vars: - devstack_localrc: - TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin - - job: name: monasca-events-python3 parent: monasca-events-tempest-base @@ -52,17 +47,14 @@ templates: - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs - check-requirements - publish-openstack-docs-pti - release-notes-jobs-python3 check: jobs: - - monasca-events-python2 - monasca-events-python3 gate: queue: monasca jobs: - - monasca-events-python2 - monasca-events-python3 diff --git a/releasenotes/notes/drop-py-2-7-22f6ed725217ced1.yaml b/releasenotes/notes/drop-py-2-7-22f6ed725217ced1.yaml new file mode 100644 index 0000000..219144c --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-22f6ed725217ced1.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of monasca-event-api + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported by monasca-event-api is Python 3.6. diff --git a/setup.cfg b/setup.cfg index ce78ba0..1b201f2 100755 --- a/setup.cfg +++ b/setup.cfg @@ -13,8 +13,6 @@ 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.6 Programming Language :: Python :: 3.7 diff --git a/test-requirements.txt b/test-requirements.txt index 86b37e4..d5eeed8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,7 +18,6 @@ voluptuous>=0.8.9 # BSD License # documentation doc8>=0.6.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 os-api-ref>=1.0.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 1fc1476..dd19ee4 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] -envlist = py27,py37,pep8,cover +envlist = py37,pep8,cover minversion = 2.7 skipsdist = True [testenv] +basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=monasca_events_api/tests/unit @@ -21,13 +22,6 @@ commands = find ./ -type f -name '*.pyc' -delete rm -Rf .testrepository/times.dbm -[testenv:py27] -description = Runs unit test using Python2.7 -basepython = python2.7 -commands = - {[testenv]commands} - stestr run {posargs} - [testenv:py36] description = Runs unit test using Python3.6 basepython = python3.6 @@ -36,7 +30,6 @@ commands = stestr run {posargs} [testenv:cover] -basepython = python3 description = Calculates code coverage setenv = PYTHON=coverage run --source monasca_events_api --parallel-mode @@ -47,34 +40,29 @@ commands = coverage xml -o cover/coverage.xml [testenv:debug] -basepython = python3 description = Allows to run unit-test with debug mode enabled commands = {[testenv]commands} oslo_debug_helper -t {env:OS_TEST_PATH} {posargs} [testenv:bashate] -basepython = python3 description = Validates (pep8-like) devstack plugins skip_install = True usedevelop = False commands = bash {toxinidir}/tools/bashate.sh [testenv:bandit] -basepython = python3 skip_install = True usedevelop = False commands = bandit -r monasca_events_api -n5 -x monasca_events_api/tests [testenv:flake8] -basepython = python3 skip_install = True usedevelop = False commands = flake8 monasca_events_api [testenv:pep8] -basepython = python3 description = Runs set of linters against codebase (flake8, bandit, bashate, checkniceness) commands = {[testenv:flake8]commands} @@ -83,7 +71,6 @@ commands = {[testenv:checkniceness]commands} [testenv:docs] -basepython = python3 description = Builds api-ref, releasenotes and devdocs commands = {[testenv:devdocs]commands} @@ -91,7 +78,6 @@ commands = {[testenv:releasenotes]commands} [testenv:api-ref] -basepython = python3 description = Called from CI scripts to test and publish the API Ref commands = rm -rf api-ref/build @@ -99,14 +85,12 @@ commands = sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html [testenv:releasenotes] -basepython = python3 description = Called from CI script to test and publish the Release Notes commands = rm -rf releasenotes/build sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:devdocs] -basepython = python3 description = Builds developer documentation commands = {[testenv]commands} @@ -116,7 +100,6 @@ commands = python setup.py build_sphinx [testenv:checkniceness] -basepython = python3 description = Validates (pep-like) documentation skip_install = True usedevelop = False @@ -126,7 +109,6 @@ commands = doc8 --file-encoding utf-8 {toxinidir}/releasenotes [testenv:checkjson] -basepython = python3 description = Validates all json samples inside doc folder deps = whitelist_externals = @@ -137,17 +119,14 @@ commands = bash -c '! find doc/ -type f -name *.json | xargs -t -n1 python -m json.tool 2>&1 > /dev/null | grep -B1 -v ^python' [testenv:genconfig] -basepython = python3 description = Generates sample documentation file for monasca-events-api commands = oslo-config-generator --config-file=config-generator/config.conf [testenv:genpolicy] -basepython = python3 description = Generates sample policy.yaml file for monasca-events-api commands = oslopolicy-sample-generator --config-file=config-generator/policy.conf [testenv:venv] -basepython = python3 commands = {posargs} [flake8] @@ -159,7 +138,6 @@ ignore = D100,D104 import-order-style = pep8 [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt