Avoid tox_install.sh for constraints support
We do not need tox_install.sh, pip can handle constraints itself and install the project correctly. Thus update tox.ini and remove the now obsolete tools/tox_install.sh file. This follows https://review.openstack.org/#/c/508061 to remove tools/tox_install.sh. Change-Id: I9ee471b253ec104d2b93829be3644ce7aef06876
This commit is contained in:
parent
2528b098a5
commit
58bafb63e1
@ -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 $?
|
|
18
tox.ini
18
tox.ini
@ -5,27 +5,27 @@ skipsdist = True
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
passenv = UPPER_CONSTRAINTS_FILE
|
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}
|
||||||
LANG=en_US.UTF-8
|
LANG=en_US.UTF-8
|
||||||
LANGUAGE=en_US:en
|
LANGUAGE=en_US:en
|
||||||
LC_ALL=C
|
LC_ALL=C
|
||||||
BRANCH_NAME=master
|
deps =
|
||||||
CLIENT_NAME=openstacksdk
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
-r{toxinidir}/requirements.txt
|
||||||
commands = stestr run {posargs}
|
commands = stestr run {posargs}
|
||||||
stestr slowest
|
stestr slowest
|
||||||
|
|
||||||
[testenv:examples]
|
[testenv:examples]
|
||||||
passenv = OS_* OPENSTACKSDK_* UPPER_CONSTRAINTS_FILE
|
passenv = OS_* OPENSTACKSDK_*
|
||||||
commands = stestr --test-path ./openstack/tests/examples run {posargs}
|
commands = stestr --test-path ./openstack/tests/examples run {posargs}
|
||||||
stestr slowest
|
stestr slowest
|
||||||
|
|
||||||
[testenv:functional]
|
[testenv:functional]
|
||||||
basepython = {env:OPENSTACKSDK_TOX_PYTHON:python2}
|
basepython = {env:OPENSTACKSDK_TOX_PYTHON:python2}
|
||||||
passenv = OS_* OPENSTACKSDK_* UPPER_CONSTRAINTS_FILE
|
passenv = OS_* OPENSTACKSDK_*
|
||||||
commands = stestr --test-path ./openstack/tests/functional run --serial {posargs}
|
commands = stestr --test-path ./openstack/tests/functional run --serial {posargs}
|
||||||
stestr slowest
|
stestr slowest
|
||||||
|
|
||||||
@ -61,7 +61,9 @@ commands = {toxinidir}/extras/run-ansible-tests.sh -e {envdir} {posargs}
|
|||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
skip_install = True
|
skip_install = True
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps =
|
||||||
|
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
|
-r{toxinidir}/test-requirements.txt
|
||||||
commands = sphinx-build -b html doc/source/ doc/build
|
commands = sphinx-build -b html doc/source/ doc/build
|
||||||
|
|
||||||
[testenv:releasenotes]
|
[testenv:releasenotes]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user