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: I30b48b58d368c2d79d3407735d2a082b3b46d2fb
This commit is contained in:
		
				
					committed by
					
						
						Andreas Jaeger
					
				
			
			
				
	
			
			
			
						parent
						
							3158069322
						
					
				
				
					commit
					e80a25ac6c
				
			@@ -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 $?
 | 
			
		||||
							
								
								
									
										8
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								tox.ini
									
									
									
									
									
								
							@@ -5,14 +5,14 @@ skipsdist = True
 | 
			
		||||
 | 
			
		||||
[testenv]
 | 
			
		||||
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}
 | 
			
		||||
install_command = pip install {opts} {packages}
 | 
			
		||||
setenv = VIRTUAL_ENV={envdir}
 | 
			
		||||
         BRANCH_NAME=master
 | 
			
		||||
         CLIENT_NAME=python-designateclient
 | 
			
		||||
         LANG=en_US.UTF-8
 | 
			
		||||
         LANGUAGE=en_US:en
 | 
			
		||||
         LC_ALL=C
 | 
			
		||||
deps = -r{toxinidir}/requirements.txt
 | 
			
		||||
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
 | 
			
		||||
 | 
			
		||||
whitelist_externals = find
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user