Avoid tox-install.sh

Code Issues Proposed changes

Instead of using tox-install.sh, we can install horizon and neutron
etc. now directly from pypi - or use the current branch in CI system using
tox-siblings.
Create doc/requirements.txt for doc requirements as well.
Update tox.ini for this change and add projects to test-requirements
file.
Note this is one step in fixing publishing of docs for this repository.
Depends-On: https://review.openstack.org/552865
Depends-On: https://review.openstack.org/554297
Change-Id: I13e61fffca48b6c004e028f0da8a1d84a2337e10

This commit is contained in:

Andreas Jaeger

2018年03月07日 09:16:38 +01:00

parent 7395d435a5

commit 35af7b89c9

5 changed files with 15 additions and 77 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

66
tools/tox_install.sh

View File

@@ -1,66 +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}

ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner

BRANCH_NAME=master

GIT_BASE=${GIT_BASE:-https://git.openstack.org/}

install_project() {

local project=1ドル

local branch=${2:-$BRANCH_NAME}

local module_name=${project//-/_}

set +e

project_installed=$(echo "import $module_name" | python 2>/dev/null ; echo $?)

set -e

if [ $project_installed -eq 0 ]; then

echo "ALREADY INSTALLED" > /tmp/tox_install.txt

echo "$project already installed; using existing package"

elif [ -x "$ZUUL_CLONER" ]; then

echo "ZUUL CLONER" > /tmp/tox_install.txt

# Make this relative to current working directory so that

# git clean can remove it. We cannot remove the directory directly

# since it is referenced after $install_cmd -e

mkdir -p .tmp

PROJECT_DIR=$(/bin/mktemp -d -p $(pwd)/.tmp)

pushd $PROJECT_DIR

$ZUUL_CLONER --cache-dir \

/opt/git \

--branch $branch \

http://git.openstack.org \

openstack/$project

cd openstack/$project

$install_cmd -e .

popd

else

echo "PIP HARDCODE" > /tmp/tox_install.txt

local GIT_REPO="$GIT_BASE/openstack/$project"

SRC_DIR="$VIRTUAL_ENV/src/$project"

git clone --depth 1 --branch $branch $GIT_REPO $SRC_DIR

$install_cmd -U -e $SRC_DIR

fi

}

set -e

install_cmd="pip install -c1ドル"

shift

install_project networking-bagpipe

install_project networking-odl 4.0.0

$install_cmd -U $*

exit $?

Avoid tox-install.sh

66 tools/tox_install.sh Unescape Escape View File

66
tools/tox_install.sh

View File