Add Constraints support

Adding constraints support to libraries is slightly more complex than
services as the libraries themselves are listed in upper-constraints.txt
which leads to errors that you can't install a specific version and a
constrained version.

This change adds constraints support by also adding a helper script to
edit the constraints to remove django_openstack_auth.

Change-Id: Ibb739fe4385caa3dd9f96f0708b7b3830a915d07
This commit is contained in:
Tony Breeds 2016-12-20 15:54:35 +11:00
parent a1ac86c6c4
commit f68a5a7d7a
2 changed files with 44 additions and 6 deletions

30
tools/tox_install.sh Executable file
View File

@ -0,0 +1,30 @@
#!/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 $?

20
tox.ini
View File

@ -1,12 +1,12 @@
[tox]
minversion = 1.6
minversion = 2.0
skipsdist = True
envlist = py27,py27dj18,pep8,py34
[testenv]
usedevelop = True
install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
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 = {[env-common]setenv}
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1
NOSE_OPENSTACK_RED=0.05
@ -16,8 +16,14 @@ deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = python openstack_auth/tests/run_tests.py {posargs}
[env-common]
setenv = VIRTUAL_ENV={envdir}
BRANCH_NAME=master
CLIENT_NAME=django_openstack_auth
[testenv:cover]
setenv = DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
setenv = {[env-common]setenv}
DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
commands =
python -m coverage erase
python -m coverage run openstack_auth/tests/run_tests.py {posargs}
@ -38,14 +44,16 @@ commands = pip install django>=1.10,<1.11
python openstack_auth/tests/run_tests.py {posargs}
[testenv:pep8]
setenv = DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
setenv = {[env-common]setenv}
DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
commands = flake8
[testenv:venv]
commands = {posargs}
[testenv:docs]
setenv = DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
setenv = {[env-common]setenv}
DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
commands = python setup.py build_sphinx
[flake8]