From 2fd7d6ede223fcff626cea0f9ff2091f72986f75 Mon Sep 17 00:00:00 2001 From: Ajay Kumar Date: Wed, 30 Oct 2019 14:03:21 +0530 Subject: [PATCH] OpenStack is dropping the py2.7 support in ussuri cycle. octavia-dashboard 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: I1a7a75ddb132c8e2f41f1e47d3ebca15cb86f461 --- doc/requirements.txt | 1 - octavia_dashboard/karma.conf.js | 2 +- octavia_dashboard/post_install.sh | 2 +- .../notes/drop-py-2-7-f3372b5c26171513.yaml | 6 ++++++ setup.cfg | 2 -- tox.ini | 13 ++----------- zuul.d/projects.yaml | 1 - 7 files changed, 10 insertions(+), 17 deletions(-) create mode 100644 releasenotes/notes/drop-py-2-7-f3372b5c26171513.yaml diff --git a/doc/requirements.txt b/doc/requirements.txt index 69e79a8c..0513dbcf 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. openstackdocstheme>=1.20.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,!=2.1.0;python_version>='3.4' # BSD sphinxcontrib-apidoc>=0.2.1 # BSD diff --git a/octavia_dashboard/karma.conf.js b/octavia_dashboard/karma.conf.js index 0dd33789..22ebcec3 100644 --- a/octavia_dashboard/karma.conf.js +++ b/octavia_dashboard/karma.conf.js @@ -21,7 +21,7 @@ var path = require('path'); module.exports = function (config) { // This tox venv is setup in the post-install npm step - var toxPath = '../.tox/py27/lib/python2.7/site-packages/'; + var toxPath = '../.tox/karma/lib/python3.6//site-packages/'; config.set({ preprocessors: { diff --git a/octavia_dashboard/post_install.sh b/octavia_dashboard/post_install.sh index e9d81e20..42adab64 100755 --- a/octavia_dashboard/post_install.sh +++ b/octavia_dashboard/post_install.sh @@ -10,4 +10,4 @@ then fi echo "Creating a tox env which will contain xStatic libraries, horizon, and openstack_dashboard" -tox -epy27 --notest; +tox -ekarma --notest; diff --git a/releasenotes/notes/drop-py-2-7-f3372b5c26171513.yaml b/releasenotes/notes/drop-py-2-7-f3372b5c26171513.yaml new file mode 100644 index 00000000..e8bda4d0 --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-f3372b5c26171513.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of octavia-dashboard + to support py2.7 is OpenStack Train. The minimum version of Python now + supported by octavia-dashboard is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 68b7334a..abec9303 100644 --- 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/tox.ini b/tox.ini index ac6a6427..a49b0fe6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] minversion = 2.5.0 -envlist = py27,py37,py3-{dj111,dj22},pep8,eslint,karma +envlist = py3,py3-{dj111,dj22},pep8,eslint,karma skipsdist = True [testenv] +basepython = python3 usedevelop = True install_command = pip install {opts} {packages} setenv = @@ -21,15 +22,12 @@ commands = python manage.py test octavia_dashboard --settings=octavia_dashboard.tests.settings [testenv:pep8] -basepython = python3 commands = flake8 [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 # npm must be installed on the system, for example # sudo apt-get install npm # sudo yum install npm (on RHEL/CentOS, enable EPEL repository) @@ -37,7 +35,6 @@ commands = npm install npm test [testenv:docs] -basepython = python3 whitelist_externals = rm deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} @@ -48,7 +45,6 @@ commands = sphinx-build -W -b html doc/source doc/build/html [testenv:pdf-docs] -basepython = python3 deps = {[testenv:docs]deps} whitelist_externals = make @@ -59,7 +55,6 @@ commands = make -C doc/build/pdf [testenv:releasenotes] -basepython = python3 whitelist_externals = rm deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} @@ -70,18 +65,15 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:debug] -basepython = python3 commands = oslo_debug_helper {posargs} [testenv:eslint] -basepython = python3 # npm must be installed on the system, for example # sudo apt-get install npm commands = npm install npm run lint [testenv:karma] -basepython = python3 # npm must be installed on the system, for example # sudo apt-get install npm commands = npm install @@ -97,7 +89,6 @@ builtins = _ exclude=.venv,.git,.tox,.tmp,dist,doc,*lib/python*,*egg,build,node_modules [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 213e19a3..0329ca77 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -4,7 +4,6 @@ - horizon-non-primary-django-jobs - horizon-nodejs10-jobs - openstack-lower-constraints-jobs - - openstack-python-jobs-horizon - openstack-python3-ussuri-jobs-horizon - publish-openstack-docs-pti - release-notes-jobs-python3