Drop python 2.7 support and testing
OpenStack is dropping the py2.7 support in ussuri cycle. python-ironicclient is ready with python 3 and ok to drop the python 2.7 support. Complete discussion & schedule can be found in - http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html - https://etherpad.openstack.org/p/drop-python2-support Ussuri Communtiy-wide goal - https://review.opendev.org/#/c/691178/ Change-Id: Iacc50fde00f0d24e9c6ee2b1ac61b8fa060094fb
This commit is contained in:
parent
db180621de
commit
f51566545e
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
# Sphinx
|
# Sphinx
|
||||||
_build
|
_build
|
||||||
doc/source/api/
|
doc/source/reference/api/
|
||||||
|
|
||||||
# Release notes
|
# Release notes
|
||||||
releasenotes/build
|
releasenotes/build
|
||||||
|
|
|
@ -3,6 +3,5 @@
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
openstackdocstheme>=1.20.0 # Apache-2.0
|
openstackdocstheme>=1.20.0 # Apache-2.0
|
||||||
reno>=2.5.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
|
sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
|
||||||
sphinxcontrib-apidoc>=0.2.0 # BSD
|
sphinxcontrib-apidoc>=0.2.0 # BSD
|
||||||
|
|
|
@ -44,12 +44,7 @@
|
||||||
export IRONICCLIENT_TEST_CONFIG=$CONFIG_FILE
|
export IRONICCLIENT_TEST_CONFIG=$CONFIG_FILE
|
||||||
|
|
||||||
cd $IRONICCLIENT_DIR
|
cd $IRONICCLIENT_DIR
|
||||||
if [[ $USE_PYTHON3 == "True" ]]; then
|
echo 'Running Functional Tests under Python3'
|
||||||
echo 'Running Functional Tests under Python3'
|
tox -e functionalpy3
|
||||||
tox -e functionalpy3
|
|
||||||
else
|
|
||||||
echo 'Running Functional Tests under Python2'
|
|
||||||
tox -e functional
|
|
||||||
fi
|
|
||||||
executable: /bin/bash
|
executable: /bin/bash
|
||||||
chdir: '/opt/stack/python-ironicclient'
|
chdir: '/opt/stack/python-ironicclient'
|
||||||
|
|
|
@ -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.
|
|
@ -12,8 +12,6 @@ classifier =
|
||||||
License :: OSI Approved :: Apache Software License
|
License :: OSI Approved :: Apache Software License
|
||||||
Operating System :: POSIX :: Linux
|
Operating System :: POSIX :: Linux
|
||||||
Programming Language :: Python
|
Programming Language :: Python
|
||||||
Programming Language :: Python :: 2
|
|
||||||
Programming Language :: Python :: 2.7
|
|
||||||
Programming Language :: Python :: 3
|
Programming Language :: Python :: 3
|
||||||
Programming Language :: Python :: 3.6
|
Programming Language :: Python :: 3.6
|
||||||
Programming Language :: Python :: 3.7
|
Programming Language :: Python :: 3.7
|
||||||
|
|
17
tox.ini
17
tox.ini
|
@ -1,9 +1,10 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 2.0
|
minversion = 2.0
|
||||||
envlist = py3,py27,pep8,pypy
|
envlist = py3,pep8,pypy
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
PYTHONDONTWRITEBYTECODE = 1
|
PYTHONDONTWRITEBYTECODE = 1
|
||||||
LANGUAGE=en_US
|
LANGUAGE=en_US
|
||||||
|
@ -19,7 +20,6 @@ commands =
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
-r{toxinidir}/requirements.txt
|
-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
|
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
flake8 {posargs}
|
flake8 {posargs}
|
||||||
doc8 doc/source CONTRIBUTING.rst README.rst
|
doc8 doc/source CONTRIBUTING.rst README.rst
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
setenv = {[testenv]setenv}
|
setenv = {[testenv]setenv}
|
||||||
PYTHON=coverage run --source ironicclient --omit='*tests*' --parallel-mode
|
PYTHON=coverage run --source ironicclient --omit='*tests*' --parallel-mode
|
||||||
commands =
|
commands =
|
||||||
|
@ -44,7 +42,6 @@ commands =
|
||||||
coverage html -d ./cover --omit='*tests*'
|
coverage html -d ./cover --omit='*tests*'
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
@ -52,21 +49,13 @@ deps =
|
||||||
-r{toxinidir}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:functional]
|
|
||||||
passenv = *
|
|
||||||
setenv = TESTS_DIR=./ironicclient/tests/functional
|
|
||||||
LANGUAGE=en_US
|
|
||||||
OS_TESTENV_NAME = {envname}
|
|
||||||
|
|
||||||
[testenv:functionalpy3]
|
[testenv:functionalpy3]
|
||||||
basepython = python3
|
|
||||||
passenv = *
|
passenv = *
|
||||||
setenv = TESTS_DIR=./ironicclient/tests/functional
|
setenv = TESTS_DIR=./ironicclient/tests/functional
|
||||||
LANGUAGE=en_US
|
LANGUAGE=en_US
|
||||||
OS_TESTENV_NAME = {envname}
|
OS_TESTENV_NAME = {envname}
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
|
@ -75,7 +64,6 @@ commands =
|
||||||
sphinx-build -W -b html doc/source doc/build/html
|
sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:pdf-docs]
|
[testenv:pdf-docs]
|
||||||
basepython = python3
|
|
||||||
whitelist_externals = make
|
whitelist_externals = make
|
||||||
deps = {[testenv:docs]deps}
|
deps = {[testenv:docs]deps}
|
||||||
commands =
|
commands =
|
||||||
|
@ -97,7 +85,6 @@ enable-extensions=H106,H203,H204,H205,H210,H904
|
||||||
import_exceptions = testtools.matchers, ironicclient.common.i18n
|
import_exceptions = testtools.matchers, ironicclient.common.i18n
|
||||||
|
|
||||||
[testenv:lower-constraints]
|
[testenv:lower-constraints]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
-c{toxinidir}/lower-constraints.txt
|
-c{toxinidir}/lower-constraints.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
|
@ -35,16 +35,6 @@
|
||||||
mysql: True
|
mysql: True
|
||||||
rabbit: 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:
|
- job:
|
||||||
name: ironicclient-tempest
|
name: ironicclient-tempest
|
||||||
parent: ironic-base
|
parent: ironic-base
|
||||||
|
@ -54,11 +44,3 @@
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
EBTABLES_RACE_FIX: True
|
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
|
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
- check-requirements
|
- check-requirements
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
- openstack-lower-constraints-jobs
|
- openstack-lower-constraints-jobs
|
||||||
- openstack-python-jobs
|
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-ussuri-jobs
|
||||||
- openstackclient-plugin-jobs
|
- openstackclient-plugin-jobs
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
|
@ -11,13 +10,9 @@
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- ironicclient-functional
|
- ironicclient-functional
|
||||||
- ironicclient-functional-python2
|
|
||||||
- ironicclient-tempest
|
- ironicclient-tempest
|
||||||
- ironicclient-tempest-python2
|
|
||||||
gate:
|
gate:
|
||||||
queue: ironic
|
queue: ironic
|
||||||
jobs:
|
jobs:
|
||||||
- ironicclient-functional
|
- ironicclient-functional
|
||||||
- ironicclient-functional-python2
|
|
||||||
- ironicclient-tempest
|
- ironicclient-tempest
|
||||||
- ironicclient-tempest-python2
|
|
||||||
|
|
Loading…
Reference in New Issue