Browse Source

Remove tox_install.sh

As part of removing reliance on the old and deprecated zuul-cloner, we
need to shift constraints declaration to the deps line. This means we
unfortunately have to duplicate the extras declarations into
test-requirements - because otherwise the contraints for
keystonemiddleware conflicts with the installation of itself.

Change-Id: I8dbb31d1c1fda6df386f456dcf1d8bbed6d168ce
Lance Bragstad 7 months ago
parent
commit
9a6875d479
3 changed files with 6 additions and 40 deletions
  1. 2
    1
      test-requirements.txt
  2. 0
    32
      tools/tox_install.sh
  3. 4
    7
      tox.ini

+ 2
- 1
test-requirements.txt View File

@@ -12,11 +12,12 @@ mock>=2.0.0 # BSD
12 12
 oslotest>=3.2.0 # Apache-2.0
13 13
 requests-mock>=1.2.0 # Apache-2.0
14 14
 stevedore>=1.20.0 # Apache-2.0
15
-stestr  # Apache-2.0
15
+stestr>=2.0.0  # Apache-2.0
16 16
 testresources>=2.0.0 # Apache-2.0/BSD
17 17
 testtools>=2.2.0 # MIT
18 18
 python-memcached>=1.56 # PSF
19 19
 WebTest>=2.0.27 # MIT
20
+oslo.messaging>=5.29.0 # Apache-2.0
20 21
 
21 22
 # Bandit security code scanner
22 23
 bandit>=1.1.0 # Apache-2.0

+ 0
- 32
tools/tox_install.sh View File

@@ -1,32 +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
-if [[ -n "$@" ]]; then
30
-    pip install -c"$localfile" -U "$@"
31
-fi
32
-exit $?

+ 4
- 7
tox.ini View File

@@ -5,18 +5,16 @@ envlist = py35,py27,pep8,releasenotes
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 8
 setenv = VIRTUAL_ENV={envdir}
10
-         BRANCH_NAME=master
11
-         CLIENT_NAME=keystonemiddleware
12 9
          OS_STDOUT_CAPTURE=1
13 10
          OS_STDERR_CAPTURE=1
14 11
          OS_TEST_TIMEOUT=60
15 12
          TESTS_DIR=./keystonemiddleware/tests/unit/
16 13
 
17
-deps = -r{toxinidir}/requirements.txt
18
-       -r{toxinidir}/test-requirements.txt
19
-       .[audit_notifications]
14
+deps =
15
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
16
+    -r{toxinidir}/requirements.txt
17
+    -r{toxinidir}/test-requirements.txt
20 18
 commands = stestr run {posargs}
21 19
 
22 20
 [testenv:pep8]
@@ -89,4 +87,3 @@ deps =
89 87
   -c{toxinidir}/lower-constraints.txt
90 88
   -r{toxinidir}/test-requirements.txt
91 89
   -r{toxinidir}/requirements.txt
92
-  .[audit_notifications]

Loading…
Cancel
Save