diff options
author | Zuul <zuul@review.openstack.org> | 2018-03-09 21:04:36 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-03-09 21:04:36 +0000 |
commit | f40f210017054bf4e30b7393094987078ee8f027 (patch) | |
tree | bd7bb03a9d48a2d124e3aa7eff3ebef33f597352 | |
parent | c432d9e93884d6962592f6d19aaec3f8f66ac3a2 (diff) | |
parent | 621332cf36d80984d3283b13a6830df6fa16e9f7 (diff) | |
download | oslo-db-f40f210017054bf4e30b7393094987078ee8f027.tar.gz |
Merge "Remove tox_install.sh and align constraints consumption"4.34.0
-rw-r--r-- | setup.cfg | 19 | ||||
-rw-r--r-- | test-requirements.txt | 17 | ||||
-rwxr-xr-x | tools/tox_install.sh | 30 | ||||
-rw-r--r-- | tox.ini | 10 |
4 files changed, 22 insertions, 54 deletions
@@ -25,25 +25,6 @@ mysql = # or oslo.db[postgresql] postgresql = psycopg2>=2.6.2 # LGPL/ZPL -# Dependencies for testing oslo.db itself. -test = - hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 - coverage!=4.4,>=4.0 # Apache-2.0 - eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT - fixtures>=3.0.0 # Apache-2.0/BSD - mock>=2.0.0 # BSD - python-subunit>=1.0.0 # Apache-2.0/BSD - oslotest>=3.2.0 # Apache-2.0 - oslo.context>=2.19.2 # Apache-2.0 - testrepository>=0.0.18 # Apache-2.0/BSD - testtools>=2.2.0 # MIT - os-testr>=1.0.0 # Apache-2.0 - bandit>=1.1.0 # Apache-2.0 -fixtures = - testresources>=2.0.0 # Apache-2.0/BSD - testscenarios>=0.4 # Apache-2.0/BSD -pifpaf = - pifpaf>=0.10.0 # Apache-2.0 [files] packages = diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 0000000..c632b63 --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,17 @@ +hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +coverage!=4.4,>=4.0 # Apache-2.0 +eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT +fixtures>=3.0.0 # Apache-2.0/BSD +mock>=2.0.0 # BSD +python-subunit>=1.0.0 # Apache-2.0/BSD +oslotest>=3.2.0 # Apache-2.0 +oslo.context>=2.19.2 # Apache-2.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testtools>=2.2.0 # MIT +os-testr>=1.0.0 # Apache-2.0 +bandit>=1.1.0 # Apache-2.0 +testresources>=2.0.0 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +pifpaf>=0.10.0 # Apache-2.0 +PyMySQL>=0.7.6 # MIT License +psycopg2>=2.6.2 # LGPL/ZPL 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 $? @@ -3,7 +3,7 @@ minversion = 2.0 envlist = py35,py27,pep8,pip-missing-reqs [testenv] -install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +install_command = pip install {opts} {packages} whitelist_externals = bash env setenv = @@ -15,10 +15,10 @@ setenv = {postgresql,all}: PIFPAF_POSTGRESQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {mysql,all}: PIFPAF_MYSQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- {mysql,postgresql,all}: BASECOMMAND={toxinidir}/tools/run-pifpaf-tests.sh - -deps = .[test,fixtures,mysql,postgresql] - {postgresql,mysql,all}: .[pifpaf] - +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 = {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} '{posargs}' |