diff --git a/.gitignore b/.gitignore index 2afaba385..ffb6c75e6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ # Sphinx _build -doc/source/api/ +doc/source/reference/api/ # Release notes releasenotes/build diff --git a/doc/requirements.txt b/doc/requirements.txt index 4c5102a30..d2ebb7d15 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,6 +3,5 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.20.0 # Apache-2.0 reno>=2.5.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,>=1.6.2;python_version>='3.4' # BSD sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/playbooks/functional/run.yaml b/playbooks/functional/run.yaml index 275ebc0c8..0108b8d16 100644 --- a/playbooks/functional/run.yaml +++ b/playbooks/functional/run.yaml @@ -44,12 +44,7 @@ export IRONICCLIENT_TEST_CONFIG=$CONFIG_FILE cd $IRONICCLIENT_DIR - if [[ $USE_PYTHON3 == "True" ]]; then - echo 'Running Functional Tests under Python3' - tox -e functionalpy3 - else - echo 'Running Functional Tests under Python2' - tox -e functional - fi + echo 'Running Functional Tests under Python3' + tox -e functionalpy3 executable: /bin/bash chdir: '/opt/stack/python-ironicclient' diff --git a/releasenotes/notes/drop-py-2-7-b0b950c0c2b6a667.yaml b/releasenotes/notes/drop-py-2-7-b0b950c0c2b6a667.yaml new file mode 100644 index 000000000..1b1bfac72 --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-b0b950c0c2b6a667.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of python-ironicclient + to support Python 2.7 is OpenStack Train. The minimum version of + Python now supported by python-ironicclient is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 08828087e..fce5885ae 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,8 +12,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/tox.ini b/tox.ini index 4b00eb0fc..d3df2ed25 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] minversion = 2.0 -envlist = py3,py27,pep8,pypy +envlist = py3,pep8,pypy skipsdist = True [testenv] +basepython = python3 setenv = VIRTUAL_ENV={envdir} PYTHONDONTWRITEBYTECODE = 1 LANGUAGE=en_US @@ -19,7 +20,6 @@ commands = stestr run {posargs} [testenv:releasenotes] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt @@ -27,13 +27,11 @@ deps = commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:pep8] -basepython = python3 commands = flake8 {posargs} doc8 doc/source CONTRIBUTING.rst README.rst [testenv:cover] -basepython = python3 setenv = {[testenv]setenv} PYTHON=coverage run --source ironicclient --omit='*tests*' --parallel-mode commands = @@ -44,7 +42,6 @@ commands = coverage html -d ./cover --omit='*tests*' [testenv:venv] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt @@ -52,21 +49,13 @@ deps = -r{toxinidir}/doc/requirements.txt commands = {posargs} -[testenv:functional] -passenv = * -setenv = TESTS_DIR=./ironicclient/tests/functional - LANGUAGE=en_US - OS_TESTENV_NAME = {envname} - [testenv:functionalpy3] -basepython = python3 passenv = * setenv = TESTS_DIR=./ironicclient/tests/functional LANGUAGE=en_US OS_TESTENV_NAME = {envname} [testenv:docs] -basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/requirements.txt @@ -75,7 +64,6 @@ commands = sphinx-build -W -b html doc/source doc/build/html [testenv:pdf-docs] -basepython = python3 whitelist_externals = make deps = {[testenv:docs]deps} commands = @@ -97,7 +85,6 @@ enable-extensions=H106,H203,H204,H205,H210,H904 import_exceptions = testtools.matchers, ironicclient.common.i18n [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt diff --git a/zuul.d/ironicclient-jobs.yaml b/zuul.d/ironicclient-jobs.yaml index 7ea4eaf0f..13c6ae5c7 100644 --- a/zuul.d/ironicclient-jobs.yaml +++ b/zuul.d/ironicclient-jobs.yaml @@ -35,16 +35,6 @@ mysql: True rabbit: True -# NOTE(iurygregory): drop when the time comes -- job: - name: ironicclient-functional-python2 - parent: ironicclient-functional - post-run: playbooks/functional/run.yaml - vars: - tox_envlist: functional - devstack_localrc: - USE_PYTHON3: False - - job: name: ironicclient-tempest parent: ironic-base @@ -54,11 +44,3 @@ vars: devstack_localrc: EBTABLES_RACE_FIX: True - -# NOTE(iurygregory): drop when the time comes -- job: - name: ironicclient-tempest-python2 - parent: ironicclient-tempest - vars: - devstack_localrc: - USE_PYTHON3: False diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 2ff9320ba..ca83f0181 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -3,7 +3,6 @@ - check-requirements - openstack-cover-jobs - openstack-lower-constraints-jobs - - openstack-python-jobs - openstack-python3-ussuri-jobs - openstackclient-plugin-jobs - publish-openstack-docs-pti @@ -11,13 +10,9 @@ check: jobs: - ironicclient-functional - - ironicclient-functional-python2 - ironicclient-tempest - - ironicclient-tempest-python2 gate: queue: ironic jobs: - ironicclient-functional - - ironicclient-functional-python2 - ironicclient-tempest - - ironicclient-tempest-python2