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: I9298add1f77b56f19f355b19da89f9799d2415c9
Depends-On: I5a88d2068c961245b4b9ed60948532f232b859a5
(cherry picked from commit d018cd7788)

Adding doc8 to test-requirements

tox -e doc was failing due to missing doc8. With this
change doc8 is added to test-requirements.txt.

Change-Id: I5a88d2068c961245b4b9ed60948532f232b859a5
Signed-off-by: csatari <gergely.csatari@nokia.com>
(cherry picked from commit bf3c423ab8)

NOTE: The two above changes have been squashed into one as they depend on
      each other to make CI pass.
Change-Id: I9298add1f77b56f19f355b19da89f9799d2415c9
This commit is contained in:
Andreas Jaeger 2017-12-02 07:23:54 +01:00 committed by Dougal Matthews
parent 0070b25695
commit 5db722ff59
3 changed files with 9 additions and 61 deletions

View File

@ -3,6 +3,7 @@
# process, which may cause wedges in the gate later.
coverage!=4.4,>=4.0 # Apache-2.0
croniter>=0.3.4 # MIT License
doc8 # Apache-2.0
eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0

View File

@ -1,57 +0,0 @@
#!/usr/bin/env bash
# Upper constraint file contains mistral version(used by tripleo-common) pin
# that is in conflict with installing mistral 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
MODULE_NAME=mistral
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
set -e
CONSTRAINTS_FILE=$1
shift
install_cmd="pip install"
mydir=$(mktemp -dt "$MODULE_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 -- $MODULE_NAME "-e file://$PWD#egg=$MODULE_NAME"
edit-constraints $localfile -- --
$install_cmd -U $*
exit $?

12
tox.ini
View File

@ -5,12 +5,15 @@ 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?h=stable/pike} {opts} {packages}
install_command = pip install {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
PYTHONDONTWRITEBYTECODE = 1
PYTHONWARNINGS=default::DeprecationWarning
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
deps = -r{toxinidir}/test-requirements.txt
deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands =
rm -f .testrepository/times.dbm
find . -type f -name "*.pyc" -delete
@ -32,6 +35,7 @@ commands = ./run_tests.sh -N --db-type mysql
[testenv:pep8]
basepython = python2.7
commands =
doc8 doc/source
flake8 {posargs} . {toxinidir}/tools/get_action_list.py {toxinidir}/tools/sync_db.py
check-uuid --package mistral_tempest_tests
@ -58,8 +62,8 @@ commands = {posargs}
basepython = python2.7
setenv = PYTHONHASHSEED=0
commands =
doc8 doc/source
python setup.py build_sphinx
rm -rf doc/build
sphinx-build -b html doc/source doc/build/html
[testenv:releasenotes]
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html