summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHervé Beraud <hberaud@redhat.com>2020-02-04 17:16:27 +0100
committerHervé Beraud <hberaud@redhat.com>2020-02-04 17:16:27 +0100
commit2961c30bceee270dd54d170e66dbfea11e1d7f0f (patch)
tree893fa5707f6daf042e7ea2ee1c2f7ff3f7549778
parent60d23fb1e8d4a85ba40162ca8fcc511973f57a09 (diff)
downloadoslo-vmware-2961c30bceee270dd54d170e66dbfea11e1d7f0f.tar.gz
[ussuri][goal] Drop python 2.7 support and testing3.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: I4b1f1b65d21340e76971d2bf31ee79d97392c454 Sem-Ver: api-break
-rw-r--r--.zuul.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-4991a70046af4b03.yaml5
-rw-r--r--setup.cfg8
-rw-r--r--setup.py8
-rw-r--r--tox.ini6
8 files changed, 12 insertions, 23 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 8249fea..f47b6c4 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
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff --git a/bindep.txt b/bindep.txt
index f52646e..69d58c3 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -6,8 +6,6 @@ gcc [platform:rpm test]
libxml2-dev [platform:dpkg test]
libxslt1-dev [platform:dpkg test]
libxslt-devel [platform:rpm test]
-python-dev [platform:dpkg test]
-python-devel [platform:rpm test]
python3-dev [platform:dpkg test]
python3-devel [platform:rpm test]
libpcre3-dev [platform:dpkg test]
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 66106c1..41665ed 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.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
reno>=2.5.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
sphinxcontrib-apidoc>=0.2.0 # BSD
diff --git a/lower-constraints.txt b/lower-constraints.txt
index cdafddd..a649c04 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -23,7 +23,6 @@ lxml==3.4.1
MarkupSafe==1.0
mccabe==0.2.1
mock==2.0.0
-monotonic==0.6
netaddr==0.7.18
netifaces==0.10.4
openstackdocstheme==1.20.0
diff --git a/releasenotes/notes/drop-python27-support-4991a70046af4b03.yaml b/releasenotes/notes/drop-python27-support-4991a70046af4b03.yaml
new file mode 100644
index 0000000..c5195c0
--- /dev/null
+++ b/releasenotes/notes/drop-python27-support-4991a70046af4b03.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/setup.cfg b/setup.cfg
index ef6dceb..37399f4 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.vmware/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 =
@@ -36,6 +37,3 @@ input_file = oslo_vmware/locale/oslo_vmware.pot
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = oslo_vmware/locale/oslo_vmware.pot
-
-[wheel]
-universal = 1
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 b5d8764..f8acf63 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