Add Constraints support
Adding constraints support to clients is slightly more complex than services as the clients 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 python-cinderclient. Change-Id: Iac0c8a6bcfa9a74a2e836d156642b1e0abf5ec31
This commit is contained in:
		
				
					committed by
					
						
						Tony Breeds
					
				
			
			
				
	
			
			
			
						parent
						
							0405d398d5
						
					
				
				
					commit
					39e24fd836
				
			
							
								
								
									
										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 $?
 | 
			
		||||
							
								
								
									
										11
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								tox.ini
									
									
									
									
									
								
							@@ -1,13 +1,17 @@
 | 
			
		||||
[tox]
 | 
			
		||||
distribute = False
 | 
			
		||||
envlist = py35,py34,py27,pep8
 | 
			
		||||
minversion = 1.8
 | 
			
		||||
minversion = 2.0
 | 
			
		||||
skipsdist = True
 | 
			
		||||
 | 
			
		||||
[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=python-cinderclient
 | 
			
		||||
passenv = *_proxy *_PROXY
 | 
			
		||||
 | 
			
		||||
deps = -r{toxinidir}/requirements.txt
 | 
			
		||||
@@ -40,6 +44,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 | 
			
		||||
 | 
			
		||||
[testenv:functional]
 | 
			
		||||
setenv =
 | 
			
		||||
  {[testenv]setenv}
 | 
			
		||||
  OS_TEST_PATH = ./cinderclient/tests/functional
 | 
			
		||||
  OS_VOLUME_API_VERSION = 2
 | 
			
		||||
# The OS_CACERT environment variable should be passed to the test
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user