Browse Source

Cleanup py27 support and docs

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
- Cleanup doc/source/conf.py to remove now obsolete content.
- Use newer openstackdocstheme version
- Remove install_command from tox.ini, the default is fine
- Remove unneeded test-requirements.txt file
- Use basepython=python3 for testenv, remove it elsewhere

Change-Id: I2659000c905b3de2f37bd88ab348d2f45e0968cc
changes/84/719184/1
Andreas Jaeger 1 year ago
parent
commit
9814a1a906
  1. 1
      deploy-guide/source/conf.py
  2. 3
      doc/requirements.txt
  3. 2
      requirements.txt
  4. 14
      setup.cfg
  5. 9
      setup.py
  6. 8
      test-requirements.txt
  7. 12
      tox.ini

1
deploy-guide/source/conf.py

@ -26,7 +26,6 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'openstackdocstheme'
]

3
doc/requirements.txt

@ -2,8 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
sphinx>=1.8.0,!=2.1.0 # BSD
sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
sphinxcontrib-mermaid>=0.3.1 # BSD
requests

2
requirements.txt

@ -2,4 +2,4 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
openstackdocstheme>=1.30.0 # Apache-2.0
openstackdocstheme>=1.31.2 # Apache-2.0

14
setup.cfg

@ -13,15 +13,5 @@ classifier =
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.3
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0
[wheel]
universal = 1
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: 3 :: Only

9
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)

8
test-requirements.txt

@ -1,8 +0,0 @@
# 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.
# Doc requirements
flake8
requests
pyquery

12
tox.ini

@ -4,18 +4,16 @@ skipsdist = True
envlist = docs,pep8,bindep
[testenv]
basepython = python3
usedevelop = True
setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
deps = -r{toxinidir}/requirements.txt
[testenv:venv]
basepython = python3
commands = {posargs}
[testenv:docs]
basepython = python3
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
@ -24,7 +22,6 @@ commands =
sphinx-build -a -E -W -d doc/build/doctrees --keep-going -b html doc/source doc/build/html
[testenv:pdf-docs]
basepython = python3
whitelist_externals = make
description =
Build PDF documentation.
@ -35,7 +32,6 @@ commands =
make -C doc/build/pdf
[testenv:pep8]
basepython = python3
whitelist_externals = bash
deps = -r{toxinidir}/test-requirements.txt
# We fail pretty horribly on bashate right now
@ -48,9 +44,7 @@ show-source = True
exclude = .tox,dist,*.egg,build
[testenv:deploy-guide]
basepython = python3
deps = {[testenv:docs]deps}
commands = sphinx-build -a -E -W -d deploy-guide/build/doctrees --keep-going -b html deploy-guide/source deploy-guide/build/html
[testenv:bindep]

Loading…
Cancel
Save