Merge "Cleanup py27 support"
This commit is contained in:
commit
63827bf737
|
@ -1,6 +1,6 @@
|
||||||
# doc build requirements
|
# 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
|
sphinxcontrib-httpdomain>=1.3.0 # BSD
|
||||||
reno>=2.5.0 # Apache-2.0
|
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
|
os-api-ref>=1.4.0 # Apache-2.0
|
||||||
|
|
|
@ -7,7 +7,7 @@ astroid==1.3.8
|
||||||
Babel==2.3.4
|
Babel==2.3.4
|
||||||
bandit==1.1.0
|
bandit==1.1.0
|
||||||
cachetools==2.0.1
|
cachetools==2.0.1
|
||||||
castellan==0.16.0
|
castellan==0.18.0
|
||||||
certifi==2018.1.18
|
certifi==2018.1.18
|
||||||
cffi==1.11.5
|
cffi==1.11.5
|
||||||
chardet==3.0.4
|
chardet==3.0.4
|
||||||
|
@ -59,7 +59,7 @@ murano-pkg-check==0.3.0
|
||||||
netaddr==0.7.18
|
netaddr==0.7.18
|
||||||
netifaces==0.10.6
|
netifaces==0.10.6
|
||||||
nose==1.3.7
|
nose==1.3.7
|
||||||
openstackdocstheme==1.20.0
|
openstackdocstheme==2.0.0
|
||||||
openstacksdk==0.12.0
|
openstacksdk==0.12.0
|
||||||
os-api-ref==1.4.0
|
os-api-ref==1.4.0
|
||||||
os-client-config==1.29.0
|
os-client-config==1.29.0
|
||||||
|
@ -127,7 +127,7 @@ semantic-version==2.8.2
|
||||||
simplejson==3.13.2
|
simplejson==3.13.2
|
||||||
smmap2==2.0.3
|
smmap2==2.0.3
|
||||||
snowballstemmer==1.2.1
|
snowballstemmer==1.2.1
|
||||||
Sphinx==1.6.2
|
Sphinx==2.0.0
|
||||||
sphinxcontrib-httpdomain==1.3.0
|
sphinxcontrib-httpdomain==1.3.0
|
||||||
sphinxcontrib-websupport==1.0.1
|
sphinxcontrib-websupport==1.0.1
|
||||||
sqlalchemy-migrate==0.11.0
|
sqlalchemy-migrate==0.11.0
|
||||||
|
|
|
@ -47,4 +47,4 @@ oslo.i18n>=3.15.3 # Apache-2.0
|
||||||
oslo.log>=3.36.0 # Apache-2.0
|
oslo.log>=3.36.0 # Apache-2.0
|
||||||
oslo.upgradecheck>=0.1.0 # Apache-2.0
|
oslo.upgradecheck>=0.1.0 # Apache-2.0
|
||||||
semantic-version>=2.8.2 # BSD
|
semantic-version>=2.8.2 # BSD
|
||||||
castellan>=0.16.0 # Apache-2.0
|
castellan>=0.18.0 # Apache-2.0
|
||||||
|
|
19
setup.cfg
19
setup.cfg
|
@ -80,22 +80,3 @@ murano_policy_modify_actions =
|
||||||
set-property = murano.policy.modify.actions.default_actions:SetPropertyAction
|
set-property = murano.policy.modify.actions.default_actions:SetPropertyAction
|
||||||
remove-relation = murano.policy.modify.actions.default_actions:RemoveRelationAction
|
remove-relation = murano.policy.modify.actions.default_actions:RemoveRelationAction
|
||||||
add-relation = murano.policy.modify.actions.default_actions:AddRelationAction
|
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
|
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -6,11 +6,11 @@ skipsdist = True
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
|
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
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
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = rm -f .testrepository/times.dbm
|
commands = rm -f .testrepository/times.dbm
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
|
|
Loading…
Reference in New Issue