summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Finucane <sfinucan@redhat.com>2020-01-31 10:42:29 +0000
committerStephen Finucane <stephenfin@redhat.com>2020-02-03 15:12:02 +0000
commit4e071eb034eae728cef397c2c37334dd2c8c9251 (patch)
tree394a1606db6de79bf51452c50833f664e62dc2cc
parentfc035dbff68fdabb92074447e390efc7f90ee030 (diff)
downloadoslo-config-4e071eb034eae728cef397c2c37334dd2c8c9251.tar.gz
[ussuri][goal] Drop python 2.7 support and testing8.0.0
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: I13ce8e8264679a19c7b108381ccb969573ea9ac6 Signed-off-by: Stephen Finucane <sfinucan@redhat.com> Sem-Ver: api-break
-rw-r--r--.zuul.d/project.yaml2
-rw-r--r--bindep.txt2
-rw-r--r--doc/requirements.txt3
-rw-r--r--lower-constraints.txt1
-rw-r--r--releasenotes/notes/drop-python27-support-87f1b4089d4cc78b.yaml5
-rw-r--r--requirements.txt1
-rw-r--r--setup.cfg13
-rw-r--r--setup.py8
-rw-r--r--tox.ini4
9 files changed, 13 insertions, 26 deletions
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 35eecfd..a60d493 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.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/bindep.txt b/bindep.txt
index ba56188..e279aff 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 5d7ece7..1a76d82 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.
-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
openstackdocstheme>=1.20.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 6868685..e9a244a 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -6,7 +6,6 @@ coverage==4.0
debtcollector==1.2.0
docutils==0.11
dulwich==0.15.0
-enum34==1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
extras==1.0.0
fixtures==3.0.0
flake8==2.5.5
diff --git a/releasenotes/notes/drop-python27-support-87f1b4089d4cc78b.yaml b/releasenotes/notes/drop-python27-support-87f1b4089d4cc78b.yaml
new file mode 100644
index 0000000..c5195c0
--- /dev/null
+++ b/releasenotes/notes/drop-python27-support-87f1b4089d4cc78b.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 fd6c874..5a20c04 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,4 @@ stevedore>=1.20.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
rfc3986>=1.2.0 # Apache-2.0
PyYAML>=3.12 # MIT
-enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
requests>=2.18.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 5ade52c..cc9fa0c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,11 +1,12 @@
[metadata]
name = oslo.config
-author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
summary = Oslo Configuration API
description-file =
README.rst
+author = OpenStack
+author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/oslo.config/latest/
+python-requires = >=3.6
classifier =
Development Status :: 5 - Production/Stable
Environment :: OpenStack
@@ -14,20 +15,16 @@ classifier =
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent
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_config
-[global]
-setup-hooks =
- pbr.hooks.setup_hook
-
[entry_points]
console_scripts =
oslo-config-generator = oslo_config.generator:main
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 c91fe72..da3f8cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
[tox]
minversion = 3.1
distribute = False
-envlist = py27,py37,pep8
-ignore_basepython_conflict = True
+envlist = py37,pep8
+ignore_basepython_conflict = true
[testenv]
basepython = python3