From d694236c3a639deff85adae97693a39a126090fd Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 5 Apr 2020 10:02:09 +0200 Subject: [PATCH] Cleanup py27 support 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 obsolete sections from setup.cfg: * Wheel is not needed for python 3 only repo * Some other sections are obsolete - Update classifiers - Update requirements, no need for python_version anymore - Remove sphinx requirements, the repo has no docs Change-Id: I3ee6abac9b5c4c639521bb2834a104bc53ce93ed --- lower-constraints.txt | 3 --- setup.cfg | 13 ++++--------- setup.py | 9 --------- test-requirements.txt | 3 --- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 53046481..c38378c8 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -65,7 +65,6 @@ oslo.policy==1.30.0 oslo.serialization==2.18.0 oslo.service==1.24.0 oslo.utils==3.33.0 -oslosphinx==4.7.0 osprofiler==1.4.0 Paste==2.0.2 PasteDeploy==1.5.0 @@ -107,8 +106,6 @@ semantic-version==2.3.1 simplejson==3.5.1 six==1.10.0 snowballstemmer==1.2.1 -Sphinx==1.6.2 -sphinxcontrib-websupport==1.0.1 statsd==3.2.1 stevedore==1.20.0 tenacity==3.2.1 diff --git a/setup.cfg b/setup.cfg index 6d7b09df..5f309a60 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,8 @@ summary = Monasca Plugin for Horizon description-file = README.rst author = OpenStack author-email = openstack-discuss@lists.openstack.org -home-page = https://github.com/openstack/monasca-ui +home-page = https://opendev.org/openstack/monasca-ui +python-requires = >=3.6 classifier = Environment :: Console Intended Audience :: Information Technology @@ -12,6 +13,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 @@ -22,11 +25,3 @@ packages = [pbr] autodoc_index_modules = True - -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source - -[wheel] -universal = 1 diff --git a/setup.py b/setup.py index 566d8443..cd35c3c3 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) diff --git a/test-requirements.txt b/test-requirements.txt index 9967fc3a..febc9fd9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,9 +8,6 @@ coverage!=4.4,>=4.0 # Apache-2.0 mock>=2.0.0 # BSD nodeenv>=0.9.4 # BSD selenium>=2.50.1 # Apache-2.0 -# Docs Requirements -sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD -oslosphinx>=4.7.0 # Apache-2.0 # Horizon pytest>=5.3.5 # MIT