Browse Source

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: I8732c7032bd45ce1186f3751f4953348ef4ef1cc
Andreas Jaeger 1 year ago
parent
commit
b9c0eb78a0
2 changed files with 5 additions and 33 deletions
  1. 0
    30
      tools/tox_install.sh
  2. 5
    3
      tox.ini

+ 0
- 30
tools/tox_install.sh View File

@@ -1,30 +0,0 @@
1
-#!/usr/bin/env bash
2
-
3
-# Client constraint file contains this client version pin that is in conflict
4
-# with installing the client from source. We should remove the version pin in
5
-# the constraints file before applying it for from-source installation.
6
-
7
-CONSTRAINTS_FILE=$1
8
-shift 1
9
-
10
-set -e
11
-
12
-# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
13
-# published to logs.openstack.org for easy debugging.
14
-localfile="$VIRTUAL_ENV/log/upper-constraints.txt"
15
-
16
-if [[ $CONSTRAINTS_FILE != http* ]]; then
17
-    CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
18
-fi
19
-# NOTE(tonyb): need to add curl to bindep.txt if the project supports bindep
20
-curl $CONSTRAINTS_FILE --insecure --progress-bar --output $localfile
21
-
22
-pip install -c$localfile openstack-requirements
23
-
24
-# This is the main purpose of the script: Allow local installation of
25
-# the current repo. It is listed in constraints file and thus any
26
-# install will be constrained and we need to unconstrain it.
27
-edit-constraints $localfile -- $CLIENT_NAME
28
-
29
-pip install -c$localfile -U $*
30
-exit $?

+ 5
- 3
tox.ini View File

@@ -7,14 +7,16 @@ skipsdist = True
7 7
 usedevelop = True
8 8
 setenv = VIRTUAL_ENV={envdir}
9 9
          OS_TEST_PATH=monasca_events_api/tests/unit
10
-         CLIENT_NAME=monasca-events-api
11 10
 passenv = *_proxy
12 11
           *_PROXY
13 12
 whitelist_externals = bash
14 13
                       find
15 14
                       rm
16
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?master} {opts} {packages}
17
-deps = -r{toxinidir}/test-requirements.txt
15
+install_command = pip install -U {opts} {packages}
16
+deps =
17
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
18
+ -r{toxinidir}/test-requirements.txt
19
+ -r{toxinidir}/requirements.txt
18 20
 commands =
19 21
   find ./ -type f -name '*.pyc' -delete
20 22
   rm -Rf .testrepository/times.dbm

Loading…
Cancel
Save