From d69a6367a1340c4828a6e5eab68211bba5f2ae73 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 21 Apr 2020 07:39:05 +0200 Subject: [PATCH] Cleanup py27 support This repo is now testing only with Python 3, so let's make a few cleanups: - Remove python 2.7 stanza from setup.py - Remove obsolete sections from setup.cfg - Update classifiers - Use newer openstackdocstheme and Sphinx versions - Cleanup */source/conf.py to remove now obsolete content. - Remove install_command from tox.ini, the default is fine - Remove hacking requirements from lower-constraints, they are not needed for install Change-Id: I150a5ee2cd08abf5ce9cf9daf2835007dea0dffd --- doc/requirements.txt | 4 ++-- doc/source/conf.py | 5 +---- lower-constraints.txt | 8 ++------ releasenotes/source/conf.py | 4 ---- setup.cfg | 10 ++-------- setup.py | 9 --------- tox.ini | 12 +++++------- 7 files changed, 12 insertions(+), 40 deletions(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index ae644f58..d1551659 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,8 +1,8 @@ # 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.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD -openstackdocstheme>=1.20.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.0.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 sphinxcontrib-apidoc>=0.2.0 # BSD sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD diff --git a/doc/source/conf.py b/doc/source/conf.py index 4fa65e6c..12c20ece 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -89,9 +89,6 @@ repository_name = 'openstack/patrole' bug_project = 'patrole' bug_tag = '' -# Must set this variable to include year, month, day, hours, and minutes. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # Output file base name for HTML help builder. htmlhelp_basename = 'patroledoc' @@ -109,4 +106,4 @@ latex_documents = [ ] # Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664 -latex_use_xindy = False \ No newline at end of file +latex_use_xindy = False diff --git a/lower-constraints.txt b/lower-constraints.txt index 2b77dff4..86d7dbd4 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -16,9 +16,7 @@ dulwich==0.19.0 extras==1.0.0 fasteners==0.14.1 fixtures==3.0.0 -flake8==2.6.2 future==0.16.0 -hacking==1.0.0 idna==2.6 imagesize==1.0.0 iso8601==0.1.12 @@ -36,7 +34,7 @@ netaddr==0.7.19 netifaces==0.10.6 nose==1.3.7 nosexcover==1.0.10 -openstackdocstheme==1.20.0 +openstackdocstheme==2.0.0 os-client-config==1.29.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 @@ -49,11 +47,9 @@ oslo.utils==3.36.0 oslotest==3.2.0 paramiko==2.4.1 pbr==2.0.0 -pep8==1.5.7 prettytable==0.7.2 pyasn1==0.4.2 pycparser==2.18 -pyflakes==0.8.1 Pygments==2.2.0 pyinotify==0.9.6 PyNaCl==1.2.1 @@ -70,7 +66,7 @@ requestsexceptions==1.4.0 rfc3986==1.1.0 six==1.11.0 snowballstemmer==1.2.1 -Sphinx==1.6.5 +Sphinx==2.0.0 sphinxcontrib-websupport==1.0.1 stestr==2.0.0 stevedore==1.20.0 diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 1aeff4b6..402c686a 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -145,10 +145,6 @@ html_static_path = ['_static'] # directly to the root of the documentation. # html_extra_path = [] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -html_last_updated_fmt = '%Y-%m-%d %H:%M' - # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. # html_use_smartypants = True diff --git a/setup.cfg b/setup.cfg index f8f0257e..b99f7f22 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,6 +14,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,14 +24,6 @@ classifier = packages = patrole_tempest_plugin -[upload_sphinx] -upload-dir = doc/build/html - -[build_releasenotes] -all_files = 1 -build-dir = releasenotes/build -source-dir = releasenotes/source - [entry_points] tempest.test_plugins = patrole_tests = patrole_tempest_plugin.plugin:PatroleTempestPlugin 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/tox.ini b/tox.ini index f42a5b5a..c598d9ef 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ ignore_basepython_conflict = True [testenv] basepython = python3 usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=./patrole_tempest_plugin/tests/unit @@ -16,8 +15,10 @@ setenv = PYTHONWARNINGS=default::DeprecationWarning passenv = OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_TEST_TIMEOUT OS_TEST_LOCK_PATH http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY whitelist_externals = find -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete stestr --test-path ./patrole_tempest_plugin/tests/unit run {posargs} @@ -70,10 +71,7 @@ commands = make -C doc/build/pdf [testenv:releasenotes] -deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} - -r{toxinidir}/requirements.txt - -r{toxinidir}/doc/requirements.txt +deps = {[testenv:docs]deps} commands = rm -rf releasenotes/build sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html