summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-02-05 17:21:38 +0000
committerGerrit Code Review <review@openstack.org>2020-02-05 17:21:38 +0000
commite07324e30fbb24e89fd63d1c5a5fe485f693a45c (patch)
tree27a66a9f28fa52931e8bd28d1e49d327846fe8bf
parent4f8467a039b5e13975fda08d7bee12f27838685f (diff)
parente6e4b73efa01281002930e0806b765200f38e7c8 (diff)
downloadpython-openstackclient-e07324e30fbb24e89fd63d1c5a5fe485f693a45c.tar.gz
Merge "Complete "Drop python2 support" goal"5.0.0
-rw-r--r--doc/requirements.txt3
-rw-r--r--releasenotes/notes/drop-py2-421c90fbdf18dbc2.yaml7
-rw-r--r--setup.cfg5
3 files changed, 8 insertions, 7 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 8639f936..5cfc337b 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,8 +3,7 @@
# process, which may cause wedges in the gate later.
openstackdocstheme>=1.23.2 # Apache-2.0
reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
sphinxcontrib-apidoc>=0.2.0 # BSD
# redirect tests in docs
diff --git a/releasenotes/notes/drop-py2-421c90fbdf18dbc2.yaml b/releasenotes/notes/drop-py2-421c90fbdf18dbc2.yaml
new file mode 100644
index 00000000..74c5d8b5
--- /dev/null
+++ b/releasenotes/notes/drop-py2-421c90fbdf18dbc2.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+ - |
+ Python 2.7 support has been dropped. The last release of
+ python-openstackclient to support Python 2.7 is OpenStack Train. The
+ minimum version of Python now supported by python-openstackclient is
+ Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index fcc97007..60caf5db 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,8 +13,6 @@ 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
@@ -720,9 +718,6 @@ openstack.volume.v3 =
[upload_sphinx]
upload-dir = doc/build/html
-[wheel]
-universal = 1
-
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg