Cleanup py27 support

This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove obsolete sections from setup.cfg
- Remove babel.cfg, this is not needed here at all
- Update requirements, no need for python_version anymore
- Switch to using sphinx-build
- Use newer openstackdocstheme and Sphinx versions
- Remove install_command from tox.ini, the default is fine
- Use TOX_CONSTRAINTS_FILE, UPPER_CONSTRAINTS_FILE is obsolete

Change-Id: I57d447e034c088c83fdd5fb8854dbd9826a200a8
This commit is contained in:
zhurong 2020-05-11 11:06:30 +08:00
parent f55d5203ae
commit 85abf25358
5 changed files with 8 additions and 36 deletions

View File

@ -1 +0,0 @@
[python: **.py]

View File

@ -1,6 +1,6 @@
# 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.
openstackdocstheme>=1.20.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
sphinx>=2.0.0,!=2.1.0 # BSD
openstackdocstheme>=2.0.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0

View File

@ -39,7 +39,7 @@ munch==2.1.0
murano-pkg-check==0.3.0
netaddr==0.7.18
netifaces==0.10.4
openstackdocstheme==1.20.0
openstackdocstheme==2.0.0
openstacksdk==0.11.2
os-client-config==1.28.0
os-service-types==1.2.0
@ -82,7 +82,7 @@ rfc3986==0.3.1
semantic-version==2.3.1
simplejson==3.5.1
snowballstemmer==1.2.1
Sphinx==1.6.2
Sphinx==2.0.0
sphinxcontrib-websupport==1.0.1
stevedore==1.20.0
tempest==17.1.0

View File

@ -67,22 +67,3 @@ openstack.application_catalog.v1 =
static-action_call = muranoclient.osc.v1.action:StaticActionCall
class-schema = muranoclient.osc.v1.schema:ShowSchema
[egg_info]
tag_build =
tag_date = 0
tag_svn_revision = 0
[compile_catalog]
directory = muranoclient/locale
domain = muranoclient
[update_catalog]
domain = muranoclient
output_dir = muranoclient/locale
input_file = muranoclient/locale/muranoclient.pot
[extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg
output_file = muranoclient/locale/muranoclient.pot

16
tox.ini
View File

@ -9,11 +9,10 @@ basepython = python3
usedevelop = True
whitelist_externals = bash
find
install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run {posargs}
@ -21,13 +20,6 @@ commands = stestr run {posargs}
[testenv:pep8]
commands = flake8 {posargs}
[testenv:py27-queens]
basepython = python2.7
install_command = pip install {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens}
[testenv:venv]
commands = {posargs}
@ -56,13 +48,13 @@ commands =
[testenv:pyflakes]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
flake8
commands = flake8
[testenv:docs]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands =
@ -70,7 +62,7 @@ commands =
[testenv:releasenotes]
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html