Merge "Remove tox_install.sh and align with constraints consumption"

3 files changed, 14 insertions, 40 deletions

diff --git a/test-requirements.txt b/test-requirements.txt
index 9b7a686..3b4b559 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -23,3 +23,6 @@ stestr>=1.0.0 # Apache-2.0
 testresources>=2.0.0 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 PyYAML>=3.12 # MIT
+requests-kerberos>=0.6 # ISC
+lxml!=3.7.0,>=3.4.1 # BSD
+oauthlib>=0.6.2 # BSD
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 $?
diff --git a/tox.ini b/tox.ini
index da10d83..a4a5c2b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,16 +5,13 @@ envlist = py35,py27,pep8,releasenotes
 
 [testenv]
 usedevelop = True
-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 = VIRTUAL_ENV={envdir}
-         BRANCH_NAME=master
-         CLIENT_NAME=keystoneauth1
          OS_STDOUT_NOCAPTURE=False
          OS_STDERR_NOCAPTURE=False
-
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       .[kerberos,saml2,betamax,oauth1]
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
 commands = stestr run {posargs}
 whitelist_externals =
   bash
@@ -65,14 +62,18 @@ import-order-style = pep8
 application-import-names = keystoneauth1
 
 [testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
-commands=
+deps =
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -r{toxinidir}/doc/requirements.txt
+commands =
     bash -c "rm -rf doc/build"
     bash -c "rm -rf doc/source/api"
     python setup.py build_sphinx
 
 [testenv:releasenotes]
-deps = -r{toxinidir}/doc/requirements.txt
+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
 
 [hacking]