diff --git a/requirements.txt b/requirements.txt index 59e34dbc..6074e115 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,8 +17,4 @@ oslo.messaging>=5.29.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 neutron-lib>=1.12.0 # Apache-2.0 - -# This project does depend on neutron as a library, but the -# openstack tooling does not play nicely with projects that -# are not publicly available in pypi. -# -e git+https://git.openstack.org/openstack/neutron#egg=neutron +neutron>=12.0.0 # Apache-2.0 diff --git a/tools/tox_install.sh b/tools/tox_install.sh deleted file mode 100755 index 2f40c286..00000000 --- a/tools/tox_install.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env bash - -# Many of neutron's repos suffer from the problem of depending on neutron, -# but it not existing on pypi. - -# This wrapper for tox's package installer will use the existing package -# if it exists, else use zuul-cloner if that program exists, else grab it -# from neutron master via a hard-coded URL. That last case should only -# happen with devs running unit tests locally. - -# From the tox.ini config page: -# install_command=ARGV -# default: -# pip install {opts} {packages} - -set -x - -ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner -neutron_installed=$(echo "import neutron" | python 2>/dev/null ; echo $?) -NEUTRON_DIR=$HOME/neutron -BRANCH_NAME=master - -set -e - -install_cmd="pip install -c$1" -shift - -if [ -d "$NEUTRON_DIR" ]; then - echo "FOUND Neutron code at $NEUTRON_DIR - using" - $install_cmd -U -e $NEUTRON_DIR -elif [ $neutron_installed -eq 0 ]; then - location=$(python -c "import neutron; print(neutron.__file__)") - echo "ALREADY INSTALLED at $location" -elif [ -x "$ZUUL_CLONER" ]; then - echo "USING ZUUL CLONER to obtain Neutron code" - cwd=$(/bin/pwd) - cd /tmp - $ZUUL_CLONER --cache-dir \ - /opt/git \ - --branch $BRANCH_NAME \ - git://git.openstack.org \ - openstack/neutron - cd openstack/neutron - $install_cmd -e . - cd "$cwd" -else - echo "LOCAL - Obtaining Neutron code from git.openstack.org" - $install_cmd -U -egit+https://git.openstack.org/openstack/neutron@$BRANCH_NAME#egg=neutron -fi - -$install_cmd -U $* -exit $? diff --git a/tox.ini b/tox.ini index 3d1e84f2..6e0cfc43 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,9 @@ setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning passenv = TRACE_FAILONLY 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 whitelist_externals = sh