From 5f11df81115fd9959d74887b84f9db80f0673e66 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sat, 16 Nov 2019 00:17:22 +0000 Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing OpenStack is dropping the py2.7 support in ussuri cycle. murano-dashbaord 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: Ibcead8ed02becfce9edcefa7f044098d71df8dff --- playbooks/legacy/murano-dashboard-sanity-check/run.yaml | 1 + releasenotes/notes/drop-py-2-7-5cb73aa4c1797456.yaml | 6 ++++++ setup.cfg | 2 -- test-requirements.txt | 1 - tox.ini | 9 ++------- 5 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/drop-py-2-7-5cb73aa4c1797456.yaml diff --git a/playbooks/legacy/murano-dashboard-sanity-check/run.yaml b/playbooks/legacy/murano-dashboard-sanity-check/run.yaml index d0068ab79..5c47cb423 100644 --- a/playbooks/legacy/murano-dashboard-sanity-check/run.yaml +++ b/playbooks/legacy/murano-dashboard-sanity-check/run.yaml @@ -30,6 +30,7 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_USE_PYTHON3=True export PROJECTS="openstack/heat $PROJECTS" export PROJECTS="openstack/python-heatclient $PROJECTS" export PROJECTS="openstack/murano $PROJECTS" diff --git a/releasenotes/notes/drop-py-2-7-5cb73aa4c1797456.yaml b/releasenotes/notes/drop-py-2-7-5cb73aa4c1797456.yaml new file mode 100644 index 000000000..eaa46c73b --- /dev/null +++ b/releasenotes/notes/drop-py-2-7-5cb73aa4c1797456.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Python 2.7 support has been dropped. Last release of murano-dashboard + to support python 2.7 is OpenStack Train. The minimum version of Python now + supported by murano-dashboardis Python 3.6. diff --git a/setup.cfg b/setup.cfg index 0061ea41a..e19ba196c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,8 +34,6 @@ classifier = Operating System :: OS Independent 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/test-requirements.txt b/test-requirements.txt index 5804edd75..20d9180e2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,7 +11,6 @@ mock>=2.0.0 # BSD # Docs Requirements 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,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD reno>=2.5.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 0f1f92e47..bc8deadee 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,10 @@ [tox] -envlist = py37,py27,py3-{dj111,dj22},pep8 +envlist = py37,py3-{dj111,dj22},pep8 minversion = 2.0 skipsdist = True [testenv] +basepython = python3 usedevelop = True setenv = VIRTUAL_ENV={envdir} DJANGO_SETTINGS_MODULE=muranodashboard.tests.settings @@ -18,7 +19,6 @@ commands = {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.tests.settings [testenv:pep8] -basepython = python3 sitepackages = False commands = flake8 @@ -30,11 +30,9 @@ deps = -r{toxinidir}/requirements.txt http://tarballs.openstack.org/horizon/horizon-stable-queens.tar.gz [testenv:venv] -basepython = python3 commands = {posargs} [testenv:cover] -basepython = python3 commands = coverage erase coverage run -a {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.tests.settings @@ -54,11 +52,9 @@ commands = nodeenv -p npm run lint [testenv:releasenotes] -basepython = python3 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:docs] -basepython = python3 commands = python setup.py build_sphinx [testenv:makemessages] @@ -74,7 +70,6 @@ builtins = _ exclude=build,.git,.tox,dist,doc,*lib/python*,*egg,tools,horizon,settings.py,*/local/*,functional_tests,node_modules [testenv:lower-constraints] -basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt