diff --git a/doc/requirements.txt b/doc/requirements.txt index dd7d942bb..3344c7f30 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,5 +1,5 @@ # doc build requirements -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 reno>=2.5.0 # Apache-2.0 openstackdocstheme>=1.20.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index 423f17213..08a68eca6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,7 @@ license = Apache License, Version 2.0 author = OpenStack author-email = openstack-discuss@lists.openstack.org home-page = https://www.openstack.org/software/releases/mitaka/components/murano +python-requires = >=3.6 classifier = Development Status :: 5 - Production/Stable Environment :: OpenStack @@ -30,6 +31,8 @@ classifier = License :: OSI Approved :: Apache Software License Operating System :: OS Independent 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 @@ -42,10 +45,6 @@ data_files = etc/murano/murano-cfapi-paste.ini etc/murano/murano-paste.ini -[global] -setup-hooks = - pbr.hooks.setup_hook - [entry_points] console_scripts = murano-api = murano.cmd.api:main diff --git a/setup.py b/setup.py index 566d84432..cd35c3c35 100644 --- a/setup.py +++ b/setup.py @@ -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)