From 9931c35dfe5b983d76d03b6a094d7ad23bcc8f91 Mon Sep 17 00:00:00 2001 From: zhurong Date: Mon, 11 May 2020 09:36:31 +0800 Subject: [PATCH] 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 - 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: Ic40d3fdaac00791fb150c1dc68a35d53ec30043d --- babel.cfg | 1 - doc/requirements.txt | 4 ++-- lower-constraints.txt | 6 +++--- requirements.txt | 2 +- setup.cfg | 19 ------------------- tox.ini | 4 ++-- 6 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 babel.cfg diff --git a/babel.cfg b/babel.cfg deleted file mode 100644 index efceab818..000000000 --- a/babel.cfg +++ /dev/null @@ -1 +0,0 @@ -[python: **.py] diff --git a/doc/requirements.txt b/doc/requirements.txt index 3344c7f30..2500e84d5 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,6 @@ # doc build requirements -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD +sphinx>=2.0.0,!=2.1.0 # BSD sphinxcontrib-httpdomain>=1.3.0 # BSD reno>=2.5.0 # Apache-2.0 -openstackdocstheme>=1.20.0 # Apache-2.0 +openstackdocstheme>=2.0.0 # Apache-2.0 os-api-ref>=1.4.0 # Apache-2.0 diff --git a/lower-constraints.txt b/lower-constraints.txt index 97d96098a..31192115a 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -7,7 +7,7 @@ astroid==1.3.8 Babel==2.3.4 bandit==1.1.0 cachetools==2.0.1 -castellan==0.16.0 +castellan==0.18.0 certifi==2018.1.18 cffi==1.11.5 chardet==3.0.4 @@ -59,7 +59,7 @@ murano-pkg-check==0.3.0 netaddr==0.7.18 netifaces==0.10.6 nose==1.3.7 -openstackdocstheme==1.20.0 +openstackdocstheme==2.0.0 openstacksdk==0.12.0 os-api-ref==1.4.0 os-client-config==1.29.0 @@ -127,7 +127,7 @@ semantic-version==2.8.2 simplejson==3.13.2 smmap2==2.0.3 snowballstemmer==1.2.1 -Sphinx==1.6.2 +Sphinx==2.0.0 sphinxcontrib-httpdomain==1.3.0 sphinxcontrib-websupport==1.0.1 sqlalchemy-migrate==0.11.0 diff --git a/requirements.txt b/requirements.txt index ccbeedca0..3eeb9b055 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,4 +47,4 @@ oslo.i18n>=3.15.3 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 oslo.upgradecheck>=0.1.0 # Apache-2.0 semantic-version>=2.8.2 # BSD -castellan>=0.16.0 # Apache-2.0 +castellan>=0.18.0 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index a0a70cd17..38e84c3f1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -80,22 +80,3 @@ murano_policy_modify_actions = set-property = murano.policy.modify.actions.default_actions:SetPropertyAction remove-relation = murano.policy.modify.actions.default_actions:RemoveRelationAction add-relation = murano.policy.modify.actions.default_actions:AddRelationAction - -[egg_info] -tag_build = -tag_date = 0 -tag_svn_revision = 0 - -[compile_catalog] -directory = murano/locale -domain = murano - -[update_catalog] -domain = murano -output_dir = murano/locale -input_file = murano/locale/murano.pot - -[extract_messages] -keywords = _ gettext ngettext l_ lazy_gettext -mapping_file = babel.cfg -output_file = murano/locale/murano.pot diff --git a/tox.ini b/tox.ini index 12611e7bc..f7c8c6689 100644 --- a/tox.ini +++ b/tox.ini @@ -6,11 +6,11 @@ skipsdist = 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} passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY -deps = -r{toxinidir}/requirements.txt +deps = -c{env:TOX_CONSTRAINTS_FILTOX_CONSTRAINTS_FILEE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = rm -f .testrepository/times.dbm stestr run {posargs}