Split docs requirements and update tox.ini
Get ourselves up to date with the latest in PTI hotness. Change-Id: Ied98273dcfa0b9622d603a8e9a8e2146fb1e081f
This commit is contained in:
parent
c9b8ead15a
commit
5dbfc60fde
|
@ -1,7 +0,0 @@
|
||||||
[DEFAULT]
|
|
||||||
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
|
||||||
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
|
||||||
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
|
|
||||||
${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
|
|
||||||
test_id_option=--load-list $IDFILE
|
|
||||||
test_list_option=--list
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
docutils>=0.11 # OSI-Approved Open Source, Public Domain
|
||||||
|
sphinx!=1.6.6,>=1.6.2 # BSD
|
||||||
|
openstackdocstheme>=1.18.1 # Apache-2.0
|
||||||
|
reno>=2.5.0 # Apache-2.0
|
|
@ -9,4 +9,4 @@ At the command line::
|
||||||
Or, if you have virtualenvwrapper installed::
|
Or, if you have virtualenvwrapper installed::
|
||||||
|
|
||||||
$ mkvirtualenv os-client-config
|
$ mkvirtualenv os-client-config
|
||||||
$ pip install os-client-config
|
$ pip install os-client-config
|
||||||
|
|
|
@ -9,8 +9,8 @@ Environment Variables
|
||||||
provide backwards compatibility to service-specific variables such as
|
provide backwards compatibility to service-specific variables such as
|
||||||
`NOVA_USERNAME`.
|
`NOVA_USERNAME`.
|
||||||
|
|
||||||
If you have OpenStack environment variables set, `os-client-config` will produce
|
If you have OpenStack environment variables set, `os-client-config` will
|
||||||
a cloud config object named `envvars` containing your values from the
|
produce a cloud config object named `envvars` containing your values from the
|
||||||
environment. If you don't like the name `envvars`, that's ok, you can override
|
environment. If you don't like the name `envvars`, that's ok, you can override
|
||||||
it by setting `OS_CLOUD_NAME`.
|
it by setting `OS_CLOUD_NAME`.
|
||||||
|
|
||||||
|
@ -115,11 +115,11 @@ location rules previously mentioned for the config files.
|
||||||
`regions` can be a list of regions. When you call `get_all_clouds`,
|
`regions` can be a list of regions. When you call `get_all_clouds`,
|
||||||
you'll get a cloud config object for each cloud/region combo.
|
you'll get a cloud config object for each cloud/region combo.
|
||||||
|
|
||||||
As seen with `dns_service_type`, any setting that makes sense to be per-service,
|
As seen with `dns_service_type`, any setting that makes sense to be
|
||||||
like `service_type` or `endpoint` or `api_version` can be set by prefixing
|
per-service, like `service_type` or `endpoint` or `api_version` can be set by
|
||||||
the setting with the default service type. That might strike you funny when
|
prefixing the setting with the default service type. That might strike you
|
||||||
setting `service_type` and it does me too - but that's just the world we live
|
funny when setting `service_type` and it does me too - but that's just the
|
||||||
in.
|
world we live in.
|
||||||
|
|
||||||
Auth Settings
|
Auth Settings
|
||||||
-------------
|
-------------
|
||||||
|
|
|
@ -5,17 +5,13 @@
|
||||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||||
|
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.0 # Apache-2.0
|
||||||
docutils>=0.11 # OSI-Approved Open Source, Public Domain
|
|
||||||
extras>=1.0.0 # MIT
|
extras>=1.0.0 # MIT
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
jsonschema<3.0.0,>=2.6.0 # MIT
|
jsonschema<3.0.0,>=2.6.0 # MIT
|
||||||
mock>=2.0.0 # BSD
|
mock>=2.0.0 # BSD
|
||||||
python-glanceclient>=2.8.0 # Apache-2.0
|
python-glanceclient>=2.8.0 # Apache-2.0
|
||||||
python-subunit>=1.0.0 # Apache-2.0/BSD
|
python-subunit>=1.0.0 # Apache-2.0/BSD
|
||||||
sphinx>=1.6.2 # BSD
|
|
||||||
openstackdocstheme>=1.17.0 # Apache-2.0
|
|
||||||
oslotest>=1.10.0 # Apache-2.0
|
oslotest>=1.10.0 # Apache-2.0
|
||||||
reno>=2.5.0 # Apache-2.0
|
stestr>=1.0.0 # Apache-2.0
|
||||||
testrepository>=0.0.18 # Apache-2.0/BSD
|
|
||||||
testscenarios>=0.4 # Apache-2.0/BSD
|
testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
testtools>=2.2.0 # MIT
|
testtools>=2.2.0 # MIT
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Client constraint file contains this client version pin that is in conflict
|
|
||||||
# with installing the client from source. We should remove the version pin in
|
|
||||||
# the constraints file before applying it for from-source installation.
|
|
||||||
|
|
||||||
CONSTRAINTS_FILE=$1
|
|
||||||
shift 1
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
|
|
||||||
# published to logs.openstack.org for easy debugging.
|
|
||||||
localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
|
|
||||||
|
|
||||||
if [[ $CONSTRAINTS_FILE != http* ]]; then
|
|
||||||
CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
|
|
||||||
fi
|
|
||||||
# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
|
|
||||||
curl $CONSTRAINTS_FILE --insecure --progress-bar --output $localfile
|
|
||||||
|
|
||||||
pip install -c$localfile openstack-requirements
|
|
||||||
|
|
||||||
# This is the main purpose of the script: Allow local installation of
|
|
||||||
# the current repo. It is listed in constraints file and thus any
|
|
||||||
# install will be constrained and we need to unconstrain it.
|
|
||||||
edit-constraints $localfile -- $CLIENT_NAME
|
|
||||||
|
|
||||||
pip install -c$localfile -U $*
|
|
||||||
exit $?
|
|
61
tox.ini
61
tox.ini
|
@ -5,37 +5,64 @@ skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
passenv = ZUUL_CACHE_DIR
|
passenv = UPPER_CONSTRAINTS_FILE
|
||||||
REQUIREMENTS_PIP_LOCATION
|
install_command = pip install -U {opts} {packages}
|
||||||
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
|
||||||
setenv =
|
setenv =
|
||||||
VIRTUAL_ENV={envdir}
|
VIRTUAL_ENV={envdir}
|
||||||
BRANCH_NAME=master
|
LANG=en_US.UTF-8
|
||||||
CLIENT_NAME=os-client-config
|
LANGUAGE=en_US:en
|
||||||
OS_STDOUT_CAPTURE=1
|
LC_ALL=C
|
||||||
OS_STDERR_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
OS_TEST_TIMEOUT=60
|
OS_STDERR_CAPTURE=1
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
OS_TEST_TIMEOUT=60
|
||||||
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
deps =
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
|
-r{toxinidir}/requirements.txt
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run {posargs}
|
||||||
|
stestr slowest
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
commands = flake8
|
usedevelop = False
|
||||||
|
skip_install = True
|
||||||
|
deps =
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
|
doc8
|
||||||
|
hacking
|
||||||
|
pygments
|
||||||
|
readme
|
||||||
|
commands =
|
||||||
|
doc8 doc/source
|
||||||
|
python setup.py check -r -s
|
||||||
|
flake8 os_client_config
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
commands = python setup.py test --coverage --coverage-package-name=os_client_config --testr-args='{posargs}'
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
PYTHON=coverage run --source os_client_config --parallel-mode
|
||||||
|
commands =
|
||||||
|
stestr run {posargs}
|
||||||
|
coverage combine
|
||||||
|
coverage html -d cover
|
||||||
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
|
skip_install = True
|
||||||
deps =
|
deps =
|
||||||
{[testenv]deps}
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
readme
|
-r{toxinidir}/requirements.txt
|
||||||
|
-r{toxinidir}/doc/requirements.txt
|
||||||
commands =
|
commands =
|
||||||
python setup.py build_sphinx
|
sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html
|
||||||
python setup.py check -r -s
|
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
|
skip_install = True
|
||||||
|
deps =
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
|
-r{toxinidir}/doc/requirements.txt
|
||||||
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
|
|
Loading…
Reference in New Issue