[ussuri][goal] Drop python 2.7 support and testing
OpenStack is dropping the py2.7 support in ussuri cycle. magnum-ui 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://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html Depends-On: https://review.opendev.org/#/c/693631/ Change-Id: I9630d3da80bd79f3886bc82e891e827238925704
This commit is contained in:
parent
c6a69f3d12
commit
a87c42234d
@ -4,7 +4,7 @@
|
|||||||
- horizon-non-primary-django-jobs
|
- horizon-non-primary-django-jobs
|
||||||
- horizon-nodejs10-jobs
|
- horizon-nodejs10-jobs
|
||||||
- openstack-lower-constraints-jobs-horizon
|
- openstack-lower-constraints-jobs-horizon
|
||||||
- openstack-python-jobs-horizon
|
- openstack-python3-ussuri-jobs-horizon
|
||||||
- publish-openstack-docs-pti
|
- publish-openstack-docs-pti
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
check:
|
check:
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
#
|
#
|
||||||
openstackdocstheme>=1.18.1 # Apache-2.0
|
openstackdocstheme>=1.18.1 # 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,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
|
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
|
||||||
sphinxcontrib-apidoc>=0.2.0 # BSD
|
sphinxcontrib-apidoc>=0.2.0 # BSD
|
||||||
|
|
||||||
|
@ -13,8 +13,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
|
||||||
|
|
||||||
|
21
tox.ini
21
tox.ini
@ -1,9 +1,10 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = pep8,py27-local,py3-{dj111,dj22},eslint,karma-local,docs-local,releasenotes,lower-constraints-local
|
envlist = pep8,,py3-{dj111,dj22},eslint,karma-local,docs-local,releasenotes,lower-constraints-local
|
||||||
minversion = 2.3.2
|
minversion = 2.3.2
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
NOSE_WITH_OPENSTACK=1
|
NOSE_WITH_OPENSTACK=1
|
||||||
@ -27,11 +28,9 @@ commands =
|
|||||||
pip install -e ../horizon
|
pip install -e ../horizon
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
commands = flake8 {posargs}
|
commands = flake8 {posargs}
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
@ -42,7 +41,6 @@ exclude = .git,.tox,dist,*lib/python*,*egg,build,panel_template,dash_template,lo
|
|||||||
max-complexity = 20
|
max-complexity = 20
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
coverage erase
|
coverage erase
|
||||||
coverage run {toxinidir}/manage.py test magnum_ui --settings=magnum_ui.test.settings {posargs} --exclude-dir=magnum_ui/test/integration_tests {posargs}
|
coverage run {toxinidir}/manage.py test magnum_ui --settings=magnum_ui.test.settings {posargs} --exclude-dir=magnum_ui/test/integration_tests {posargs}
|
||||||
@ -52,12 +50,6 @@ commands =
|
|||||||
# NOTE(shu-mutow): On CI infra, horizon will be installed
|
# NOTE(shu-mutow): On CI infra, horizon will be installed
|
||||||
# according to job setting. but on local, we need to install
|
# according to job setting. but on local, we need to install
|
||||||
# horizon from master branch.
|
# horizon from master branch.
|
||||||
[testenv:py27-local]
|
|
||||||
basepython = python2.7
|
|
||||||
commands =
|
|
||||||
{[testenv:hz-local]commands}
|
|
||||||
{[testenv]commands}
|
|
||||||
|
|
||||||
[testenv:py36-local]
|
[testenv:py36-local]
|
||||||
basepython = python3.6
|
basepython = python3.6
|
||||||
commands =
|
commands =
|
||||||
@ -65,7 +57,6 @@ commands =
|
|||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
|
|
||||||
[testenv:eslint]
|
[testenv:eslint]
|
||||||
basepython = python3
|
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
npm
|
npm
|
||||||
commands =
|
commands =
|
||||||
@ -76,7 +67,6 @@ commands =
|
|||||||
# from master branch into karma environment with python3.x for testing javascripts.
|
# from master branch into karma environment with python3.x for testing javascripts.
|
||||||
# Horizon from master is needed to be cloned into ../horizon on both local and CI.
|
# Horizon from master is needed to be cloned into ../horizon on both local and CI.
|
||||||
[testenv:karma]
|
[testenv:karma]
|
||||||
basepython = python3
|
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
{[testenv:eslint]whitelist_externals}
|
{[testenv:eslint]whitelist_externals}
|
||||||
commands =
|
commands =
|
||||||
@ -84,14 +74,12 @@ commands =
|
|||||||
npm run test
|
npm run test
|
||||||
|
|
||||||
[testenv:karma-local]
|
[testenv:karma-local]
|
||||||
basepython = python3
|
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
{[testenv:eslint]whitelist_externals}
|
{[testenv:eslint]whitelist_externals}
|
||||||
commands =
|
commands =
|
||||||
{[testenv:karma]commands}
|
{[testenv:karma]commands}
|
||||||
|
|
||||||
[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}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
@ -99,7 +87,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
|
|
||||||
deps = {[testenv:docs]deps}
|
deps = {[testenv:docs]deps}
|
||||||
whitelist_externals =
|
whitelist_externals =
|
||||||
make
|
make
|
||||||
@ -110,7 +97,6 @@ commands =
|
|||||||
make -C doc/build/pdf
|
make -C doc/build/pdf
|
||||||
|
|
||||||
[testenv:docs-local]
|
[testenv:docs-local]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
{[testenv:docs]deps}
|
{[testenv:docs]deps}
|
||||||
commands=
|
commands=
|
||||||
@ -118,21 +104,18 @@ commands=
|
|||||||
{[testenv:docs]commands}
|
{[testenv:docs]commands}
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
{[testenv:docs]deps}
|
{[testenv:docs]deps}
|
||||||
commands =
|
commands =
|
||||||
sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
|
|
||||||
[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
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
|
|
||||||
[testenv:lower-constraints-local]
|
[testenv:lower-constraints-local]
|
||||||
basepython = python3
|
|
||||||
deps =
|
deps =
|
||||||
{[testenv:lower-constraints]deps}
|
{[testenv:lower-constraints]deps}
|
||||||
commands =
|
commands =
|
||||||
|
Loading…
Reference in New Issue
Block a user