From 18685083414cc247bb96f656a65e6b8c7f989ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Mon, 3 Feb 2020 18:30:47 +0100 Subject: [ussuri][goal] Drop python 2.7 support and testing OpenStack is dropping the py2.7 support in Ussuri cycle. 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: If437786eb8dbba9386dd473b45dab0933812c649 --- .zuul.yaml | 2 -- doc/requirements.txt | 3 +-- lower-constraints.txt | 1 - releasenotes/notes/drop-python27-support-f97f680651693b47.yaml | 5 +++++ requirements.txt | 2 -- setup.cfg | 5 +++-- setup.py | 8 -------- tox.ini | 7 ++----- 8 files changed, 11 insertions(+), 22 deletions(-) create mode 100644 releasenotes/notes/drop-python27-support-f97f680651693b47.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 35eecfd..a60d493 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,10 +1,8 @@ - project: templates: - check-requirements - - lib-forward-testing - lib-forward-testing-python3 - openstack-lower-constraints-jobs - - openstack-python-jobs - openstack-python3-ussuri-jobs - periodic-stable-jobs - publish-openstack-docs-pti diff --git a/doc/requirements.txt b/doc/requirements.txt index 4bf9a83..df4bd74 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,8 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # this is required for the docs build jobs -sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD -sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD +sphinx>=1.8.0,!=2.1.0 # BSD openstackdocstheme>=1.20.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD diff --git a/lower-constraints.txt b/lower-constraints.txt index 7d32d91..c27fe46 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -17,7 +17,6 @@ keystoneauth1==3.4.0 linecache2==1.0.0 mccabe==0.2.1 mock==2.0.0 -monotonic==0.6 netaddr==0.7.18 netifaces==0.10.4 os-client-config==1.28.0 diff --git a/releasenotes/notes/drop-python27-support-f97f680651693b47.yaml b/releasenotes/notes/drop-python27-support-f97f680651693b47.yaml new file mode 100644 index 0000000..c5195c0 --- /dev/null +++ b/releasenotes/notes/drop-python27-support-f97f680651693b47.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Support for Python 2.7 has been dropped. The latest version of Python now + supported is Python 3.6. diff --git a/requirements.txt b/requirements.txt index 9e3c458..30aa6a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,10 +9,8 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 six>=1.10.0 # MIT -funcsigs>=1.0.0;python_version=='2.7' or python_version=='2.6' # Apache-2.0 iso8601>=0.1.11 # MIT oslo.i18n>=3.15.3 # Apache-2.0 -monotonic>=0.6;python_version<'3.3' # Apache-2.0 pytz>=2013.6 # MIT netaddr>=0.7.18 # BSD netifaces>=0.10.4 # MIT diff --git a/setup.cfg b/setup.cfg index 4940aad..3f870b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,6 +6,7 @@ description-file = author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/oslo.utils/latest/ +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -13,11 +14,11 @@ 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 + Programming Language :: Python :: 3 :: Only + Programming Language :: Python :: Implementation :: CPython [files] packages = diff --git a/setup.py b/setup.py index 566d844..f63cc23 100644 --- a/setup.py +++ b/setup.py @@ -16,14 +16,6 @@ # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/tox.ini b/tox.ini index 5546d66..c44e501 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 3.1 -envlist = py27,py37,pep8 -ignore_basepython_conflict = True +envlist = py37,pep8 +ignore_basepython_conflict = true [testenv] basepython = python3 @@ -11,9 +11,6 @@ deps = -r{toxinidir}/requirements.txt commands = stestr run --slowest {posargs} -[testenv:py27] -basepython = python2.7 - [testenv:pep8] commands = flake8 -- cgit v1.2.1