summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2017-12-02 20:27:54 +0100
committerAndreas Jaeger <jaegerandi@gmail.com>2017-12-02 20:32:49 +0000
commit0f3f25590dde4f8cf896d3b3144479bdd7bc7d08 (patch)
tree2209a3baafeede75888c6eef95cfd2d9e05372b0
parentdbc30e69809ea8f3ee73cc93e8937321fa8860a4 (diff)
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: I0a80865a8a18c49b4d883850488cc0c73fe1bfcd
Notes
Notes (review): Code-Review+2: Doug Hellmann <doug@doughellmann.com> Workflow+1: Doug Hellmann <doug@doughellmann.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 03 Dec 2017 18:10:59 +0000 Reviewed-on: https://review.openstack.org/524920 Project: openstack-dev/pbr Branch: refs/heads/master
-rwxr-xr-xtools/tox_install.sh30
-rw-r--r--tox.ini9
2 files changed, 4 insertions, 35 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 @@
1#!/usr/bin/env bash
2
3# Client constraint file contains this client version pin that is in conflict
4# with installing the client from source. We should remove the version pin in
5# the constraints file before applying it for from-source installation.
6
7CONSTRAINTS_FILE="$1"
8shift 1
9
10set -e
11
12# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
13# published to logs.openstack.org for easy debugging.
14localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
15
16if [[ "$CONSTRAINTS_FILE" != http* ]]; then
17 CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
18fi
19# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
20curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
21
22pip install -c"$localfile" openstack-requirements
23
24# This is the main purpose of the script: Allow local installation of
25# the current repo. It is listed in constraints file and thus any
26# install will be constrained and we need to unconstrain it.
27edit-constraints "$localfile" -- "$CLIENT_NAME"
28
29pip install -c"$localfile" -U "$@"
30exit $?
diff --git a/tox.ini b/tox.ini
index 914724b..e449267 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,12 +5,11 @@ envlist = py33,py34,py35,py36,py27,pypy,pep8,docs
5[testenv] 5[testenv]
6usedevelop = True 6usedevelop = True
7whitelist_externals = bash 7whitelist_externals = bash
8install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} 8install_command = pip install {opts} {packages}
9passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE 9passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE
10setenv = 10deps =
11 VIRTUAL_ENV={envdir} 11 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
12 CLIENT_NAME=pbr 12 -r{toxinidir}/test-requirements.txt
13deps = -r{toxinidir}/test-requirements.txt
14commands = 13commands =
15 python setup.py test --testr-args='{posargs}' 14 python setup.py test --testr-args='{posargs}'
16 15