diff options
author | Zuul <zuul@review.openstack.org> | 2017-12-20 06:48:12 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-12-20 06:48:12 +0000 |
commit | abfd726a52bc5ac85083bac79cf905d4d8d2c903 (patch) | |
tree | e368dbd54cdfe609ee53a45c6dc1be716d6d2a04 | |
parent | c3a392d8ef1184c756b71b4bb874f5d2b4fe860b (diff) | |
parent | 87ff8d96367cb50ce4b4b62323c37a4eee516074 (diff) | |
download | oslo-middleware-abfd726a52bc5ac85083bac79cf905d4d8d2c903.tar.gz |
-rwxr-xr-x | tools/tox_install.sh | 30 | ||||
-rw-r--r-- | tox.ini | 10 |
2 files changed, 4 insertions, 36 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index e61b63a..0000000 --- a/tools/tox_install.sh +++ /dev/null @@ -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 $? @@ -5,15 +5,13 @@ envlist = py35,py27,pypy,pep8 [testenv] setenv = VIRTUAL_ENV={envdir} - BRANCH_NAME=master - CLIENT_NAME=oslo.middleware -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 = -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] -deps = - -r{toxinidir}/test-requirements.txt commands = flake8 # Run security linter |