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: Ie7c06ead39c8597ec9326f223625d1fa0d5208d1
This commit is contained in:
		| @@ -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-openstackclient | ||||
| 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 $? | ||||
							
								
								
									
										16
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								tox.ini
									
									
									
									
									
								
							| @@ -5,13 +5,15 @@ skipdist = 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 -U {opts} {packages} | ||||
| setenv = VIRTUAL_ENV={envdir} | ||||
|          OS_STDOUT_CAPTURE=1 | ||||
|          OS_STDERR_CAPTURE=1 | ||||
|          OS_TEST_TIMEOUT=60 | ||||
| deps = -r{toxinidir}/test-requirements.txt | ||||
| deps = | ||||
|   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} | ||||
|   -r{toxinidir}/test-requirements.txt | ||||
|   -r{toxinidir}/requirements.txt | ||||
| commands = ostestr {posargs} | ||||
| whitelist_externals = ostestr | ||||
|  | ||||
| @@ -54,14 +56,6 @@ commands = | ||||
|     bandit -r openstackclient -x tests -s B105,B106,B107,B401,B404,B603,B606,B607,B110,B605,B101 | ||||
|  | ||||
| [testenv:unit-tips] | ||||
| 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} | ||||
| setenv = VIRTUAL_ENV={envdir} | ||||
|          OS_STDOUT_CAPTURE=1 | ||||
|          OS_STDERR_CAPTURE=1 | ||||
|          OS_TEST_TIMEOUT=60 | ||||
| deps = -r{toxinidir}/test-requirements.txt | ||||
| commands = | ||||
|     pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff" | ||||
|     pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Monty Taylor
					Monty Taylor