diff options
author | Andreas Jaeger <aj@suse.com> | 2017-12-02 09:18:09 +0100 |
---|---|---|
committer | Andreas Jaeger <jaegerandi@gmail.com> | 2017-12-02 17:00:45 +0000 |
commit | a7df9d88f54f70b2514a7967d6cebdc9a1e698f1 (patch) | |
tree | b2c86cde3d76847a35ec1ccd684b64630a0a01d1 | |
parent | 15496e0c0faae83517aefe47df367841808867d8 (diff) | |
download | python-barbicanclient-a7df9d88f54f70b2514a7967d6cebdc9a1e698f1.tar.gz |
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: I600fa540b45e8dfddb18c36cae778fcddccff705
-rwxr-xr-x | tools/tox_install.sh | 53 | ||||
-rw-r--r-- | tox.ini | 9 |
2 files changed, 5 insertions, 57 deletions
diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index 7203698..0000000 --- a/tools/tox_install.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env bash - -# [liujiong] This file is refer to tox_install.sh in neutron-lib. -# Library constraint file contains this library version pin that is in conflict -# with installing the library 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 -LIB_NAME=python-barbicanclient -requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?) - -set -e - -CONSTRAINTS_FILE=$1 -shift - -install_cmd="pip install" -mydir=$(mktemp -dt "$LIB_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 "Requirements already installed; using existing package" -elif [ -x "$ZUUL_CLONER" ]; then - 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 - 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 -- $LIB_NAME "-e file://$PWD#egg=$LIB_NAME" - -$install_cmd -U $* -exit $? @@ -5,10 +5,12 @@ 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} -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 commands = coverage erase @@ -30,8 +32,7 @@ commands = python setup.py build_sphinx [testenv:functional] # This tox env is purely to make local test development easier # Note: This requires local running instances of Barbican -deps = - {[testenv]deps} +deps = {[testenv]deps} commands = nosetests {toxinidir}/functionaltests/{posargs} -v [flake8] |