Small cleanups after Python2 drop
Remove requirements only needed by Python prior to version 3.5. Remove python 2.7 code from setup.py. Remove from setup.py ancient sections. Change-Id: Ie223b743a0f8def53874bfbbb5f9000ad26f030b
This commit is contained in:
parent
e7237b468f
commit
4c5cf2deea
@ -1,8 +1,7 @@
|
||||
# The order of packages is significant, because pip processes them in the order
|
||||
# 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
|
||||
docutils>=0.11 # OSI-Approved Open Source, Public Domain
|
||||
openstackdocstheme>=1.20.0 # Apache-2.0
|
||||
beautifulsoup4>=4.6.0 # MIT
|
||||
|
@ -13,8 +13,6 @@ keystoneauth1>=3.18.0 # Apache-2.0
|
||||
munch>=2.1.0 # MIT
|
||||
decorator>=4.4.1 # BSD
|
||||
jmespath>=0.9.0 # MIT
|
||||
ipaddress>=1.0.17;python_version<'3.3' # PSF
|
||||
futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
|
||||
iso8601>=0.1.11 # MIT
|
||||
netifaces>=0.10.4 # MIT
|
||||
|
||||
|
12
setup.cfg
12
setup.cfg
@ -27,15 +27,3 @@ packages =
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
openstack-inventory = openstack.cloud.cmd.inventory:main
|
||||
|
||||
[build_sphinx]
|
||||
source-dir = doc/source
|
||||
build-dir = doc/build
|
||||
all_files = 1
|
||||
warning-is-error = 1
|
||||
|
||||
[upload_sphinx]
|
||||
upload-dir = doc/build/html
|
||||
|
||||
[wheel]
|
||||
universal = 1
|
||||
|
8
setup.py
8
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)
|
||||
|
Loading…
Reference in New Issue
Block a user