diff options
author | Andreas Jaeger <aj@suse.com> | 2020-04-04 16:46:25 +0200 |
---|---|---|
committer | Andreas Jaeger <aj@suse.com> | 2020-04-04 16:47:34 +0200 |
commit | baa89534a3568363fdc518a587a7679657a048c7 (patch) | |
tree | 7059316f46a7a9e18eb81623027cdbb7456e21ac | |
parent | 82da2378eaf1e2283ed623760d065cc972dd0871 (diff) | |
download | python-glanceclient-baa89534a3568363fdc518a587a7679657a048c7.tar.gz |
Cleanup py27 support
Make a few cleanups:
- Remove python 2.7 stanza from setup.py
- Update classifiers
- Update requirements, no need for python_version anymore
Change-Id: I6b6dfb0959973abf0c2e8325006025db2a5d85d0
-rw-r--r-- | doc/requirements.txt | 3 | ||||
-rw-r--r-- | setup.cfg | 2 | ||||
-rw-r--r-- | setup.py | 9 |
3 files changed, 3 insertions, 11 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt index 4c33153..e8ba0fa 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -3,6 +3,5 @@ # process, which may cause wedges in the gate later. openstackdocstheme>=1.20.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -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,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD sphinxcontrib-apidoc>=0.2.0 # BSD @@ -17,6 +17,8 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: POSIX :: Linux Programming Language :: Python + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# 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) |