Avoid tox_install.sh for constraints support
We do not need tox_install.sh, pip can handle constraints itself and install the project correctly. Thus update tox.ini and remove the now obsolete tools/tox_install.sh file. This follows https://review.openstack.org/#/c/508061 to remove tools/tox_install.sh. Change-Id: I84cee5a9a728b9d6dc7909ac28a60b9c20c2348c
This commit is contained in:
		
				
					committed by
					
						
						Andreas Jaeger
					
				
			
			
				
	
			
			
			
						parent
						
							fbff3c60b7
						
					
				
				
					commit
					79d8861066
				
			@@ -1,28 +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
 | 
			
		||||
 | 
			
		||||
localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
 | 
			
		||||
 | 
			
		||||
if [[ $CONSTRAINTS_FILE != http* ]]; then
 | 
			
		||||
    CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
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 $?
 | 
			
		||||
							
								
								
									
										6
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								tox.ini
									
									
									
									
									
								
							@@ -7,8 +7,10 @@ skipsdist = True
 | 
			
		||||
setenv = VIRTUAL_ENV={envdir}
 | 
			
		||||
         CLIENT_NAME=python-heatclient
 | 
			
		||||
usedevelop = True
 | 
			
		||||
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
 | 
			
		||||
deps = -r{toxinidir}/requirements.txt
 | 
			
		||||
install_command = pip install {opts} {packages}
 | 
			
		||||
deps =
 | 
			
		||||
       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
 | 
			
		||||
       -r{toxinidir}/requirements.txt
 | 
			
		||||
       -r{toxinidir}/test-requirements.txt
 | 
			
		||||
commands = find . -type f -name "*.py[c|o]" -delete
 | 
			
		||||
           python setup.py testr --slowest --testr-args='{posargs}'
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user