From 57cfce71dbe4f66d3141adb84e30ee03615f9402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Beraud?= Date: Tue, 4 Feb 2020 16:49:32 +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: I700fe8837312c5c9d88dcdd073389f81a1d874bd Sem-Ver: api-break --- .zuul.yaml | 2 -- doc/requirements.txt | 3 +-- lower-constraints.txt | 1 - ...rop-python27-support-26fad37c3f7a3d28.yaml | 5 ++++ setup.cfg | 25 +++---------------- setup.py | 8 ------ tox.ini | 6 ++--- 7 files changed, 12 insertions(+), 38 deletions(-) create mode 100644 releasenotes/notes/drop-python27-support-26fad37c3f7a3d28.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 5bc57da..4252c22 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,7 +3,6 @@ # process, which may cause wedges in the gate later. 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 sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/lower-constraints.txt b/lower-constraints.txt index fc1160d..81e190d 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -22,7 +22,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-26fad37c3f7a3d28.yaml b/releasenotes/notes/drop-python27-support-26fad37c3f7a3d28.yaml new file mode 100644 index 0000000..5684dbe --- /dev/null +++ b/releasenotes/notes/drop-python27-support-26fad37c3f7a3d28.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 ff836e4..bfff6cf 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.reports/latest +python-requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -13,37 +14,20 @@ 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 = oslo_reports -[pbr] -autodoc_index_modules = true -api_doc_dir = reference/api -autodoc_exclude_modules = - oslo_reports._i18n - oslo_reports._utils - oslo_reports.tests.* - [entry_points] oslo.config.opts = oslo.reports = oslo_reports.opts:list_opts -[build_sphinx] -source-dir = doc/source -build-dir = doc/build -all_files = 1 -warning-is-error = 1 - -[upload_sphinx] -upload-dir = doc/build/html - [compile_catalog] directory = oslo_reports/locale domain = oslo_reports @@ -57,6 +41,3 @@ input_file = oslo_reports/locale/oslo_reports.pot keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg output_file = oslo_reports/locale/oslo_reports.pot - -[wheel] -universal = true 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 4217367..59c6ac3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] -minversion = 3.1 -envlist = py27,py37,pep8 -ignore_basepython_conflict = True +minversion = 3.1.1 +envlist = py37,pep8 +ignore_basepython_conflict = true [testenv] basepython = python3