From ac07b563361c7e8723bfff3a79bbf21a6a098423 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 26 Jul 2021 16:29:33 +0100 Subject: [PATCH] Drop Python 2.7 support This is now a Python 3-only package. We must temporarily cap Sphinx at 3.x or lower to get the build passing, but this can be addressed in a follow-up shortly. Change-Id: I1923d1dcd92cce349211dee5b01a3c365b151ead Signed-off-by: Stephen Finucane --- .zuul.yaml | 2 +- doc/requirements.txt | 3 +-- setup.cfg | 11 ++++------- test-requirements.txt | 3 +-- tox.ini | 4 ++-- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index f42aa59..1a22121 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,5 @@ - project: templates: - - openstack-python-jobs - openstack-python36-jobs - openstack-python37-jobs + - openstack-python38-jobs diff --git a/doc/requirements.txt b/doc/requirements.txt index e78a1bb..da0972d 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,2 +1 @@ -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<4.0.0 # BSD diff --git a/setup.cfg b/setup.cfg index 8af1fbd..25795e9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,17 +4,19 @@ author = Christophe de Vienne author-email = python-wsme@googlegroups.com summary = Simplify the writing of REST APIs, and extend them with additional protocols. description-file = README.rst -url = http://git.openstack.org/cgit/openstack/wsme +url = https://opendev.org/x/wsme license = MIT +python_requires = >=3.6 classifier = Development Status :: 3 - Alpha Operating System :: OS Independent Programming Language :: Python - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy License :: OSI Approved :: MIT License @@ -37,8 +39,3 @@ extra_files = setup.py README.rst tests - -[bdist_wheel] -# WSME has different requirements depending on the version of Python -# being used, so we cannot build universal wheels. -universal = 0 diff --git a/test-requirements.txt b/test-requirements.txt index 0ffd3be..e00c42c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,6 @@ transaction pecan -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<4.0.0 # BSD Flask flask-restful nose diff --git a/tox.ini b/tox.ini index f4e23e7..03023cc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 3.1 -envlist = py27,py35,py36,pypy,coverage,pep8 -ignore_basepython_conflict = True +envlist = py36,py37,py38,py39,pypy,coverage,pep8 +ignore_basepython_conflict = true [testenv] basepython = python3