openstack
/
senlin
Code Issues Proposed changes

Merge "Cleanup Python 2.7 support"

This commit is contained in:
Zuul 2020-03-31 00:47:48 +00:00 committed by Gerrit Code Review
parent 30e5a90552 20a434c862
commit 4627fbfb4a
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/requirements.txt
View File

@ -4,5 +4,5 @@
# this is required for the docs build jobs # this is required for the docs build jobs
openstackdocstheme>=1.20.0 # Apache-2.0 openstackdocstheme>=1.20.0 # Apache-2.0
os-api-ref>=1.4.0 # Apache-2.0 os-api-ref>=1.4.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5;python_version>='3.4' # BSD sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5 # BSD
reno>=2.5.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0

2
doc/source/conf.py
View File

@ -15,8 +15,6 @@ import os
import sys import sys
from senlin.version import version_info as senlin_version
sys.path.insert(0, os.path.abspath('../..')) sys.path.insert(0, os.path.abspath('../..'))
BASE_DIR = os.path.dirname(os.path.abspath(__file__)) BASE_DIR = os.path.dirname(os.path.abspath(__file__))

12
setup.cfg
View File

@ -6,6 +6,7 @@ description-file =
author = OpenStack author = OpenStack
author-email = openstack-discuss@lists.openstack.org author-email = openstack-discuss@lists.openstack.org
home-page = https://docs.openstack.org/senlin/latest/ home-page = https://docs.openstack.org/senlin/latest/
python-requires = >=3.6
classifier = classifier =
Environment :: OpenStack Environment :: OpenStack
Intended Audience :: Information Technology Intended Audience :: Information Technology
@ -13,6 +14,7 @@ classifier =
License :: OSI Approved :: Apache Software License License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
@ -77,10 +79,6 @@ senlin.endpoints =
heat = senlin.engine.notifications.heat_endpoint:HeatNotificationEndpoint heat = senlin.engine.notifications.heat_endpoint:HeatNotificationEndpoint
nova = senlin.engine.notifications.nova_endpoint:NovaNotificationEndpoint nova = senlin.engine.notifications.nova_endpoint:NovaNotificationEndpoint
[global]
setup-hooks =
pbr.hooks.setup_hook
[compile_catalog] [compile_catalog]
directory = senlin/locale directory = senlin/locale
domain = senlin domain = senlin
@ -94,9 +92,3 @@ input_file = senlin/locale/senlin.pot
keywords = _ gettext ngettext l_ lazy_gettext keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg mapping_file = babel.cfg
output_file = senlin/locale/senlin.pot output_file = senlin/locale/senlin.pot
[build_sphinx]
all_files = 1
build-dir = doc/build
source-dir = doc/source
warning-is-error = 1

8
setup.py
View File

@ -16,14 +16,6 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools 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( setuptools.setup(
setup_requires=['pbr>=2.0.0'], setup_requires=['pbr>=2.0.0'],
pbr=True) pbr=True)