diff options
author | Zuul <zuul@review.openstack.org> | 2018-03-23 22:00:02 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-03-23 22:00:02 +0000 |
commit | 904fb5b2a0ecaca7a993ba55afa47e937bff6d2b (patch) | |
tree | aa1b3070ae60ea046fa2eaa03df50281b204ebd1 | |
parent | f04d1d0ed6b891233b06c9dc6285415d27859b22 (diff) | |
parent | 8ece7fcf2d5eaa40b7ecf40e81cc16c09a599535 (diff) |
Merge "Remove tox_install.sh and align with constraints consumption"
-rw-r--r-- | test-requirements.txt | 3 | ||||
-rwxr-xr-x | tools/tox_install.sh | 30 | ||||
-rw-r--r-- | tox.ini | 21 |
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 | |||
23 | testresources>=2.0.0 # Apache-2.0/BSD | 23 | testresources>=2.0.0 # Apache-2.0/BSD |
24 | testtools>=2.2.0 # MIT | 24 | testtools>=2.2.0 # MIT |
25 | PyYAML>=3.12 # MIT | 25 | PyYAML>=3.12 # MIT |
26 | requests-kerberos>=0.6 # ISC | ||
27 | lxml!=3.7.0,>=3.4.1 # BSD | ||
28 | 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 @@ | |||
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 | |||
7 | CONSTRAINTS_FILE="$1" | ||
8 | shift 1 | ||
9 | |||
10 | set -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. | ||
14 | localfile="$VIRTUAL_ENV/log/upper-constraints.txt" | ||
15 | |||
16 | if [[ "$CONSTRAINTS_FILE" != http* ]]; then | ||
17 | CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE" | ||
18 | fi | ||
19 | # NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep | ||
20 | curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile" | ||
21 | |||
22 | pip 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. | ||
27 | edit-constraints "$localfile" -- "$CLIENT_NAME" | ||
28 | |||
29 | pip install -c"$localfile" -U "$@" | ||
30 | exit $? | ||
@@ -5,16 +5,13 @@ envlist = py35,py27,pep8,releasenotes | |||
5 | 5 | ||
6 | [testenv] | 6 | [testenv] |
7 | usedevelop = True | 7 | usedevelop = True |
8 | install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} | ||
9 | setenv = VIRTUAL_ENV={envdir} | 8 | setenv = VIRTUAL_ENV={envdir} |
10 | BRANCH_NAME=master | ||
11 | CLIENT_NAME=keystoneauth1 | ||
12 | OS_STDOUT_NOCAPTURE=False | 9 | OS_STDOUT_NOCAPTURE=False |
13 | OS_STDERR_NOCAPTURE=False | 10 | OS_STDERR_NOCAPTURE=False |
14 | 11 | deps = | |
15 | deps = -r{toxinidir}/requirements.txt | 12 | -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} |
16 | -r{toxinidir}/test-requirements.txt | 13 | -r{toxinidir}/test-requirements.txt |
17 | .[kerberos,saml2,betamax,oauth1] | 14 | -r{toxinidir}/requirements.txt |
18 | commands = stestr run {posargs} | 15 | commands = stestr run {posargs} |
19 | whitelist_externals = | 16 | whitelist_externals = |
20 | bash | 17 | bash |
@@ -65,14 +62,18 @@ import-order-style = pep8 | |||
65 | application-import-names = keystoneauth1 | 62 | application-import-names = keystoneauth1 |
66 | 63 | ||
67 | [testenv:docs] | 64 | [testenv:docs] |
68 | deps = -r{toxinidir}/doc/requirements.txt | 65 | deps = |
69 | commands= | 66 | -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} |
67 | -r{toxinidir}/doc/requirements.txt | ||
68 | commands = | ||
70 | bash -c "rm -rf doc/build" | 69 | bash -c "rm -rf doc/build" |
71 | bash -c "rm -rf doc/source/api" | 70 | bash -c "rm -rf doc/source/api" |
72 | python setup.py build_sphinx | 71 | python setup.py build_sphinx |
73 | 72 | ||
74 | [testenv:releasenotes] | 73 | [testenv:releasenotes] |
75 | deps = -r{toxinidir}/doc/requirements.txt | 74 | deps = |
75 | -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} | ||
76 | -r{toxinidir}/doc/requirements.txt | ||
76 | commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html | 77 | commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html |
77 | 78 | ||
78 | [hacking] | 79 | [hacking] |