[ussuri][goal] Drop python 2.7 support and testing

OpenStack is dropping the py2.7 support in ussuri cycle.

freezer-web-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

Change-Id: I7a85a88ad3d248ea081eb22db6507f9bd21493f7
This commit is contained in:
Ghanshyam Mann 2019-11-22 01:52:07 +00:00
parent 1fc3835933
commit 8f353278d4
6 changed files with 11 additions and 16 deletions

View File

@ -3,9 +3,7 @@
- check-requirements - check-requirements
- horizon-non-primary-django-jobs - horizon-non-primary-django-jobs
- openstack-lower-constraints-jobs - openstack-lower-constraints-jobs
- openstack-python-jobs - openstack-python3-ussuri-jobs
- openstack-python35-jobs
- openstack-python36-jobs
check: check:
jobs: jobs:
- freezer-web-ui-ubuntu - freezer-web-ui-ubuntu

View File

@ -2,7 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
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
openstackdocstheme>=1.18.1 # Apache-2.0 openstackdocstheme>=1.18.1 # Apache-2.0

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Python 2.7 support has been dropped. Last release of freezer-web-ui
to support py2.7 is OpenStack Train. The minimum version of Python now
supported by freezer-web-ui is Python 3.6.

View File

@ -17,9 +17,9 @@ classifier =
Operating System :: OS Independent Operating System :: OS Independent
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Topic :: Internet :: WWW/HTTP Topic :: Internet :: WWW/HTTP
keywords = keywords =
horizon horizon

View File

@ -11,7 +11,6 @@ oslo.config>=5.2.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT
unittest2>=1.1.0 # BSD unittest2>=1.1.0 # BSD
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
oslosphinx>=4.7.0 # Apache-2.0 oslosphinx>=4.7.0 # Apache-2.0
astroid==1.6.5;python_version<"3.0" # LGPLv2.1 astroid==1.6.5;python_version<"3.0" # LGPLv2.1

11
tox.ini
View File

@ -1,9 +1,10 @@
[tox] [tox]
envlist = py27,py36,py37,py3-{dj111,dj22},pep8,pylint,docs envlist = py36,py37,py3-{dj111,dj22},pep8,pylint,docs
minversion = 2.0 minversion = 2.0
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
@ -19,9 +20,6 @@ commands =
dj22: pip install django>=2.2,<2.3 dj22: pip install django>=2.2,<2.3
python manage.py test {posargs} python manage.py test {posargs}
[testenv:py27]
basepython = python2.7
[testenv:py36] [testenv:py36]
basepython = python3.6 basepython = python3.6
@ -29,19 +27,15 @@ basepython = python3.6
basepython = python3.7 basepython = python3.7
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 {posargs} commands = flake8 {posargs}
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:cover] [testenv:cover]
basepython = python3
commands = python setup.py test --coverage --testr-args={posargs} commands = python setup.py test --coverage --testr-args={posargs}
[testenv:docs] [testenv:docs]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
setenv = DJANGO_SETTINGS_MODULE=disaster_recovery.test.settings setenv = DJANGO_SETTINGS_MODULE=disaster_recovery.test.settings
commands = python setup.py build_sphinx commands = python setup.py build_sphinx
@ -55,7 +49,6 @@ max-complexity = 20
ignore = H405,H404,H403,H401,H238,H306,H701 ignore = H405,H404,H403,H401,H238,H306,H701
[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