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 hacking. Change-Id: Id01984f5a986cf84a8fff3f028bb6246364ea2ff
This commit is contained in:
		
							
								
								
									
										30
									
								
								tools/tox_install.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										30
									
								
								tools/tox_install.sh
									
									
									
									
									
										Executable 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 $?
 | 
			
		||||
							
								
								
									
										10
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								tox.ini
									
									
									
									
									
								
							@@ -1,12 +1,15 @@
 | 
			
		||||
[tox]
 | 
			
		||||
minversion = 1.6
 | 
			
		||||
minversion = 2.0
 | 
			
		||||
skipsdist = True
 | 
			
		||||
envlist = py34,py26,py27,pep8,pypy
 | 
			
		||||
 | 
			
		||||
[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 =
 | 
			
		||||
    VIRTUAL_ENV={envdir}
 | 
			
		||||
    BRANCH_NAME=master
 | 
			
		||||
    CLIENT_NAME=hacking
 | 
			
		||||
deps = -r{toxinidir}/requirements.txt
 | 
			
		||||
       -r{toxinidir}/test-requirements.txt
 | 
			
		||||
commands =
 | 
			
		||||
@@ -24,7 +27,6 @@ commands =
 | 
			
		||||
  bash integration-test/test.sh {posargs}
 | 
			
		||||
 | 
			
		||||
[testenv:cover]
 | 
			
		||||
setenv = VIRTUAL_ENV={envdir}
 | 
			
		||||
commands =
 | 
			
		||||
  python setup.py testr --coverage
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user