Revert "Add Constraints support"

Per http://lists.openstack.org/pipermail/openstack-dev/2017-December/125348.html

> For many projects, tox_install.sh is not needed at all

Let's see if that holds for python-swiftclient!

This reverts commit f2f278fcbec3ad52a1726bb5a3f775d13bcc99dc.

Change-Id: I0462c50ec71d87bac226f83a0d0942871ef5a0e7
This commit is contained in:
Tim Burke 2018-01-17 10:09:47 -08:00
parent cde257de5c
commit a9b8f0a0d1
3 changed files with 3 additions and 38 deletions

@ -1,7 +1,6 @@
# This is a cross-platform list tracking distribution packages needed by tests;
# see http://docs.openstack.org/infra/bindep/ for additional information.
curl
pypy [test !platform:fedora]
pypy-dev [test platform:dpkg]
pypy-devel [test platform:rpm !platform:fedora]

@ -1,30 +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 remove the version pin in
# the constraints file before applying it for from-source installation.
CONSTRAINTS_FILE="$1"
shift 1
set -e
# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
# published to logs.openstack.org for easy debugging.
localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
if [[ "$CONSTRAINTS_FILE" != http* ]]; then
CONSTRAINTS_FILE="file://$CONSTRAINTS_FILE"
fi
# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
curl "$CONSTRAINTS_FILE" --insecure --progress-bar --output "$localfile"
python -m pip install -c"$localfile" openstack-requirements
# 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.
python "$(which edit-constraints)" "$localfile" -- $CLIENT_NAME
python -m pip install -c"$localfile" -U "$@"
exit $?

10
tox.ini

@ -5,13 +5,11 @@ 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 = python -m pip install -U {opts} {packages}
list_dependencies_command = python -m pip freeze
setenv =
LANG=en_US.utf8
VIRTUAL_ENV={envdir}
BRANCH_NAME=master
CLIENT_NAME=python-swiftclient
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
@ -31,13 +29,11 @@ commands =
commands = {posargs}
[testenv:cover]
commands = python setup.py testr --coverage
commands = python setup.py testr --coverage
coverage report
[testenv:func]
setenv =
{[testenv]setenv}
OS_TEST_PATH=tests.functional
setenv = OS_TEST_PATH=tests.functional
whitelist_externals =
coverage
rm