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: I53fb6723c1b451f9bbacb1dfc1db681f2b5fce47
This commit is contained in:
		 Andreas Jaeger
					Andreas Jaeger
				
			
				
					committed by
					
						 Andreas Jaeger
						Andreas Jaeger
					
				
			
			
				
	
			
			
			 Andreas Jaeger
						Andreas Jaeger
					
				
			
						parent
						
							283d1f80c5
						
					
				
				
					commit
					063f0632fd
				
			| @@ -1,55 +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 replace the version pin in |  | ||||||
| # the constraints file before applying it for from-source installation. |  | ||||||
|  |  | ||||||
| ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner |  | ||||||
| BRANCH_NAME=master |  | ||||||
| CLIENT_NAME=python-rsdclient |  | ||||||
| requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?) |  | ||||||
|  |  | ||||||
| set -e |  | ||||||
|  |  | ||||||
| CONSTRAINTS_FILE=$1 |  | ||||||
| shift |  | ||||||
|  |  | ||||||
| install_cmd="pip install" |  | ||||||
| mydir=$(mktemp -dt "$CLIENT_NAME-tox_install-XXXXXXX") |  | ||||||
| trap "rm -rf $mydir" EXIT |  | ||||||
| localfile=$mydir/upper-constraints.txt |  | ||||||
| if [[ $CONSTRAINTS_FILE != http* ]]; then |  | ||||||
|     CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE |  | ||||||
| fi |  | ||||||
| curl $CONSTRAINTS_FILE -k -o $localfile |  | ||||||
| install_cmd="$install_cmd -c$localfile" |  | ||||||
|  |  | ||||||
| if [ $requirements_installed -eq 0 ]; then |  | ||||||
|     echo "ALREADY INSTALLED" > /tmp/tox_install.txt |  | ||||||
|     echo "Requirements already installed; using existing package" |  | ||||||
| elif [ -x "$ZUUL_CLONER" ]; then |  | ||||||
|     echo "ZUUL CLONER" > /tmp/tox_install.txt |  | ||||||
|     pushd $mydir |  | ||||||
|     $ZUUL_CLONER --cache-dir \ |  | ||||||
|         /opt/git \ |  | ||||||
|         --branch $BRANCH_NAME \ |  | ||||||
|         git://git.openstack.org \ |  | ||||||
|         openstack/requirements |  | ||||||
|     cd openstack/requirements |  | ||||||
|     $install_cmd -e . |  | ||||||
|     popd |  | ||||||
| else |  | ||||||
|     echo "PIP HARDCODE" > /tmp/tox_install.txt |  | ||||||
|     if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then |  | ||||||
|         REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements" |  | ||||||
|     fi |  | ||||||
|     $install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION} |  | ||||||
| fi |  | ||||||
|  |  | ||||||
| # 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 "-e file://$PWD#egg=$CLIENT_NAME" |  | ||||||
|  |  | ||||||
| $install_cmd -U $* |  | ||||||
| exit $? |  | ||||||
							
								
								
									
										4
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								tox.ini
									
									
									
									
									
								
							| @@ -5,12 +5,12 @@ skipsdist = True | |||||||
|  |  | ||||||
| [testenv] | [testenv] | ||||||
| usedevelop = True | usedevelop = True | ||||||
| install_command = | install_command = pip install {opts} {packages} | ||||||
|     {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} |  | ||||||
| setenv = | setenv = | ||||||
|     VIRTUAL_ENV={envdir} |     VIRTUAL_ENV={envdir} | ||||||
|     PYTHONWARNINGS=default::DeprecationWarning |     PYTHONWARNINGS=default::DeprecationWarning | ||||||
| deps = | deps = | ||||||
|  |     -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} | ||||||
|     -r{toxinidir}/requirements.txt |     -r{toxinidir}/requirements.txt | ||||||
|     -r{toxinidir}/test-requirements.txt |     -r{toxinidir}/test-requirements.txt | ||||||
| commands = python setup.py test --slowest --testr-args='{posargs}' | commands = python setup.py test --slowest --testr-args='{posargs}' | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user