Cleanup Python 2.7 support
OpenStack is dropping the py2.7 support in ussuri cycle. Make a few cleanups: - Remove python 2.7 stanza from setup.py - Add requires on python >= 3.6 to setup.cfg so that pypi and pip know about the requirement - Remove ancient pbr section from setup.cfg - Update requirements - Use newer openstackdocstheme and setup storyboard support for it - Remove Babel as requirement, this is not needed here anymore. Change-Id: I0fd6fbdcbe788b0dfc2b1e20989b0a19ceec59f5
This commit is contained in:
parent
c33675508c
commit
7977b49dda
|
@ -34,8 +34,7 @@ extensions = [
|
|||
|
||||
# openstackdocstheme options
|
||||
repository_name = 'openstack/sahara'
|
||||
bug_project = '935'
|
||||
bug_tag = 'api-ref'
|
||||
use_storyboard = True
|
||||
|
||||
html_theme = 'openstackdocs'
|
||||
html_theme_options = {
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
# 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.
|
||||
openstackdocstheme>=1.20.0 # Apache-2.0
|
||||
openstackdocstheme>=1.31.2 # Apache-2.0
|
||||
os-api-ref>=1.6.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-httpdomain>=1.3.0 # BSD
|
||||
whereto>=0.3.0 # Apache-2.0
|
||||
|
|
|
@ -41,8 +41,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'sp
|
|||
|
||||
# openstackdocstheme options
|
||||
repository_name = 'openstack/sahara'
|
||||
bug_project = '935'
|
||||
bug_tag = 'doc'
|
||||
use_storyboard = True
|
||||
|
||||
config_generator_config_file = 'config-generator.conf'
|
||||
config_sample_basename = 'sahara'
|
||||
|
|
|
@ -21,8 +21,7 @@ extensions = [
|
|||
|
||||
# openstackdocstheme options
|
||||
repository_name = 'openstack/sahara'
|
||||
bug_project = '935'
|
||||
bug_tag = 'releasenotes'
|
||||
use_storyboard = True
|
||||
|
||||
# Add any paths that contain templates here, relative to this directory.
|
||||
templates_path = ['_templates']
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||
|
||||
alembic>=0.8.10 # MIT
|
||||
Babel!=2.4.0,>=2.3.4 # BSD
|
||||
botocore>=1.5.1 # Apache-2.0
|
||||
castellan>=0.16.0 # Apache-2.0
|
||||
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
|
||||
|
|
|
@ -3,6 +3,7 @@ name = sahara
|
|||
summary = Sahara project
|
||||
description-file = README.rst
|
||||
license = Apache Software License
|
||||
python-requires = >=3.6
|
||||
classifiers =
|
||||
Programming Language :: Python
|
||||
Programming Language :: Python :: 3
|
||||
|
@ -17,9 +18,6 @@ author = OpenStack
|
|||
author-email = openstack-discuss@lists.openstack.org
|
||||
home-page = https://docs.openstack.org/sahara/latest/
|
||||
|
||||
[global]
|
||||
setup-hooks = pbr.hooks.setup_hook
|
||||
|
||||
[files]
|
||||
packages =
|
||||
sahara
|
||||
|
|
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