summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHervé Beraud <hberaud@redhat.com>2020-02-03 18:19:40 +0100
committerAndreas Jaeger <jaegerandi@gmail.com>2020-02-06 07:21:40 +0000
commit5fb2045c7a38efda9b3a85c995093da1ca26ef5d (patch)
treefd087ec5f5cac347f55fa13ce24a659d76227554
parente51d993fbca16d90505e1e1f09a773df0fdc9028 (diff)
downloadoslo-policy-5fb2045c7a38efda9b3a85c995093da1ca26ef5d.tar.gz
[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: If6a07eee86a2aaf65bdf9fbb338809ad47e02a46
-rw-r--r--.zuul.yaml2
-rw-r--r--doc/requirements.txt3
-rw-r--r--lower-constraints.txt1
-rw-r--r--releasenotes/notes/drop-python27-support-9aa06224812cc352.yaml5
-rw-r--r--setup.cfg24
-rw-r--r--setup.py8
-rw-r--r--tox.ini4
7 files changed, 11 insertions, 36 deletions
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 970dcf6..9cf3697 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,8 +3,7 @@
# process, which may cause wedges in the gate later.
openstackdocstheme>=1.20.0 # 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
sphinxcontrib-apidoc>=0.2.0 # BSD
reno>=2.5.0 # Apache-2.0
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 7717f7b..32f1f7d 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -20,7 +20,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-9aa06224812cc352.yaml b/releasenotes/notes/drop-python27-support-9aa06224812cc352.yaml
new file mode 100644
index 0000000..5684dbe
--- /dev/null
+++ b/releasenotes/notes/drop-python27-support-9aa06224812cc352.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 7937fb2..dcb000c 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.policy/latest/
+python-requires = >=3.6
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -13,23 +14,16 @@ 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_policy
-[pbr]
-autodoc_index_modules = True
-api_doc_dir = reference/api
-autodoc_exclude_modules =
- oslo_policy.tests.*
- oslo_policy._*
-
[entry_points]
oslo.config.opts =
oslo.policy = oslo_policy.opts:list_opts
@@ -45,15 +39,6 @@ oslo.policy.rule_checks =
http = oslo_policy._external:HttpCheck
https = oslo_policy._external:HttpsCheck
-[build_sphinx]
-all-files = 1
-warning-is-error = 1
-source-dir = doc/source
-build-dir = doc/build
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
[compile_catalog]
directory = oslo_policy/locale
domain = oslo_policy
@@ -67,6 +52,3 @@ input_file = oslo_policy/locale/oslo_policy.pot
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = oslo_policy/locale/oslo_policy.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 21552b8..6b29f08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
[tox]
minversion = 3.1
-envlist = py27,py37,pep8,docs
-ignore_basepython_conflict = True
+envlist = py37,pep8,docs
+ignore_basepython_conflict = true
[testenv]
basepython = python3