From 13270884894075668eab17e071a3cd7d8f141128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 4 Feb 2020 17:08:33 +0100 Subject: [PATCH] [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: Ic8653cdf5a3d9c36ea608a0cd91d72e0a5921a26 Sem-Ver: api-break --- .zuul.yaml | 4 +--- bindep.txt | 2 -- doc/requirements.txt | 3 +-- lower-constraints.txt | 1 - .../notes/drop-python27-support-b3e377b0dcfa4f5c.yaml | 5 +++++ setup.cfg | 8 +++----- setup.py | 8 -------- tox.ini | 4 ++-- 8 files changed, 12 insertions(+), 23 deletions(-) create mode 100644 releasenotes/notes/drop-python27-support-b3e377b0dcfa4f5c.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 73f9ad18..4c566e24 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -4,11 +4,9 @@ - oslo.versionedobjects-src-grenade-devstack-multinode templates: - check-requirements - - lib-forward-testing - lib-forward-testing-python3 - openstack-lower-constraints-jobs - - openstack-python-jobs - - openstack-python3-train-jobs + - openstack-python3-ussuri-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/bindep.txt b/bindep.txt index ba561888..e279aff9 100644 --- a/bindep.txt +++ b/bindep.txt @@ -2,8 +2,6 @@ # see http://docs.openstack.org/infra/bindep/ for additional information. locales [platform:debian] -python-dev [platform:dpkg] -python-devel [platform:rpm] python3-all-dev [platform:ubuntu !platform:ubuntu-precise] python3-dev [platform:dpkg] python3-devel [platform:fedora] diff --git a/doc/requirements.txt b/doc/requirements.txt index 1264adee..ce1c5119 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,8 +3,7 @@ # process, which may cause wedges in the gate later. # These are needed for docs generation openstackdocstheme>=1.18.1 # Apache-2.0 -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 reno>=2.5.0 # Apache-2.0 mock>=2.0.0 # BSD diff --git a/lower-constraints.txt b/lower-constraints.txt index 2ab81695..94a3bb41 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -25,7 +25,6 @@ linecache2==1.0.0 MarkupSafe==1.0 mccabe==0.2.1 mock==2.0.0 -monotonic==0.6 mox3==0.20.0 msgpack-python==0.4.0 netaddr==0.7.18 diff --git a/releasenotes/notes/drop-python27-support-b3e377b0dcfa4f5c.yaml b/releasenotes/notes/drop-python27-support-b3e377b0dcfa4f5c.yaml new file mode 100644 index 00000000..5684dbe6 --- /dev/null +++ b/releasenotes/notes/drop-python27-support-b3e377b0dcfa4f5c.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Support for Python 2.7 has been dropped. The minimum version of Python now + supported is Python 3.6. diff --git a/setup.cfg b/setup.cfg index 5eae32ef..f7270be2 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.versionedobjects/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 = @@ -40,6 +41,3 @@ input_file = oslo_versionedobjects/locale/oslo_versionedobjects.pot keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg output_file = oslo_versionedobjects/locale/oslo_versionedobjects.pot - -[bdist_wheel] -universal = true diff --git a/setup.py b/setup.py index 566d8443..f63cc23c 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 a36ccb72..cd1ba566 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -minversion = 3.1 -envlist = py27,py37,pep8 +minversion = 3.1.1 +envlist = py37,pep8 basepython = python3 ignore_basepython_conflict = true