Browse Source

Avoid tox_install.sh for constraints support

Follow https://review.openstack.org/#/c/508061 to remove
tools/tox_install.sh, we can build without it.

Change-Id: Ia27fb4f8a4da8d5ae2755b54c3274402362ae521
changes/42/524342/2
Andreas Jaeger 1 year ago
parent
commit
eca1489fb0
2 changed files with 2 additions and 34 deletions
  1. 0
    30
      tools/tox_install.sh
  2. 2
    4
      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 $?

+ 2
- 4
tox.ini View File

@@ -5,13 +5,11 @@ 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}
9
-setenv =
10
-   VIRTUAL_ENV={envdir}
11
-   CLIENT_NAME=openstack-doc-tools
8
+install_command = pip install -U {opts} {packages}
12 9
 # Install also sitemap scraping tool, not installed by default
13 10
 # therefore not in requirements file
14 11
 deps = scrapy>=1.0.0
12
+       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
15 13
        -r{toxinidir}/test-requirements.txt
16 14
        -r{toxinidir}/requirements.txt
17 15
 commands = python setup.py testr --slowest --testr-args='{posargs}'

Loading…
Cancel
Save