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: Iff0494f5fc46a57792035aaf44d391cbafa0df87
Andreas Jaeger 1 year ago
parent
commit
c70266da43
2 changed files with 4 additions and 33 deletions
  1. 0
    30
      tools/tox_install.sh
  2. 4
    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
-
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 $?

+ 4
- 3
tox.ini View File

@@ -5,12 +5,13 @@ skipsdist = True
5 5
 
6 6
 [testenv]
7 7
 usedevelop = True
8
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
8
+install_command = pip install {opts} {packages}
9 9
 setenv =
10 10
    VIRTUAL_ENV={envdir}
11 11
    PYTHONWARNINGS=default::DeprecationWarning
12
-   CLIENT_NAME=os-dpm
13
-deps = -r{toxinidir}/test-requirements.txt
12
+deps =
13
+       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
14
+       -r{toxinidir}/test-requirements.txt
14 15
        -r{toxinidir}/requirements.txt
15 16
 whitelist_externals = bash
16 17
 commands = bash tools/pretty_tox.sh '{posargs}'

Loading…
Cancel
Save