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: Ie2bf2618c8e202653a45cde195bd395ab7058dc1
This commit is contained in:
Andreas Jaeger
2017-12-19 11:03:09 +01:00
parent 9d53c73f26
commit f999996ed1
4 changed files with 7 additions and 39 deletions

View File

@@ -26,11 +26,6 @@ packages =
oslo.config.opts =
oslo.versionedobjects = oslo_versionedobjects._options:list_opts
[extras]
fixtures =
mock>=2.0.0 # BSD
fixtures>=3.0.0 # Apache-2.0/BSD
[build_sphinx]
source-dir = doc/source
build-dir = doc/build

View File

@@ -11,3 +11,6 @@ sphinx>=1.6.2 # BSD
coverage!=4.4,>=4.0 # Apache-2.0
jsonschema<3.0.0,>=2.6.0 # MIT
reno>=2.5.0 # Apache-2.0
mock>=2.0.0 # BSD
fixtures>=3.0.0 # Apache-2.0/BSD

View File

@@ -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 $?

View File

@@ -6,10 +6,10 @@ envlist = py35,py27,pypy,pep8
setenv =
VIRTUAL_ENV={envdir}
BRANCH_NAME=master
CLIENT_NAME=oslo.versionedobjects
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
deps = .[fixtures]
-r{toxinidir}/test-requirements.txt
install_command = pip install {opts} {packages}
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:pep8]