Browse Source

Merge "Remove tox_install.sh and align constraints consumption"

tags/4.34.0^0
Zuul 1 year ago
parent
commit
f40f210017
4 changed files with 22 additions and 54 deletions
  1. 0
    19
      setup.cfg
  2. 17
    0
      test-requirements.txt
  3. 0
    30
      tools/tox_install.sh
  4. 5
    5
      tox.ini

+ 0
- 19
setup.cfg View File

@@ -25,25 +25,6 @@ mysql =
25 25
 # or oslo.db[postgresql]
26 26
 postgresql =
27 27
   psycopg2>=2.6.2 # LGPL/ZPL
28
-# Dependencies for testing oslo.db itself.
29
-test =
30
-  hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
31
-  coverage!=4.4,>=4.0 # Apache-2.0
32
-  eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
33
-  fixtures>=3.0.0 # Apache-2.0/BSD
34
-  mock>=2.0.0 # BSD
35
-  python-subunit>=1.0.0 # Apache-2.0/BSD
36
-  oslotest>=3.2.0 # Apache-2.0
37
-  oslo.context>=2.19.2 # Apache-2.0
38
-  testrepository>=0.0.18 # Apache-2.0/BSD
39
-  testtools>=2.2.0 # MIT
40
-  os-testr>=1.0.0 # Apache-2.0
41
-  bandit>=1.1.0 # Apache-2.0
42
-fixtures =
43
-  testresources>=2.0.0 # Apache-2.0/BSD
44
-  testscenarios>=0.4 # Apache-2.0/BSD
45
-pifpaf =
46
-  pifpaf>=0.10.0 # Apache-2.0
47 28
 
48 29
 [files]
49 30
 packages =

+ 17
- 0
test-requirements.txt View File

@@ -0,0 +1,17 @@
1
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
2
+coverage!=4.4,>=4.0 # Apache-2.0
3
+eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
4
+fixtures>=3.0.0 # Apache-2.0/BSD
5
+mock>=2.0.0 # BSD
6
+python-subunit>=1.0.0 # Apache-2.0/BSD
7
+oslotest>=3.2.0 # Apache-2.0
8
+oslo.context>=2.19.2 # Apache-2.0
9
+testrepository>=0.0.18 # Apache-2.0/BSD
10
+testtools>=2.2.0 # MIT
11
+os-testr>=1.0.0 # Apache-2.0
12
+bandit>=1.1.0 # Apache-2.0
13
+testresources>=2.0.0 # Apache-2.0/BSD
14
+testscenarios>=0.4 # Apache-2.0/BSD
15
+pifpaf>=0.10.0 # Apache-2.0
16
+PyMySQL>=0.7.6 # MIT License
17
+psycopg2>=2.6.2 # LGPL/ZPL

+ 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
- 5
tox.ini View File

@@ -3,7 +3,7 @@ minversion = 2.0
3 3
 envlist = py35,py27,pep8,pip-missing-reqs
4 4
 
5 5
 [testenv]
6
-install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
6
+install_command = pip install {opts} {packages}
7 7
 whitelist_externals = bash
8 8
                       env
9 9
 setenv =
@@ -15,10 +15,10 @@ setenv =
15 15
    {postgresql,all}: PIFPAF_POSTGRESQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql --
16 16
    {mysql,all}: PIFPAF_MYSQL=pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql --
17 17
    {mysql,postgresql,all}: BASECOMMAND={toxinidir}/tools/run-pifpaf-tests.sh
18
-
19
-deps = .[test,fixtures,mysql,postgresql]
20
-    {postgresql,mysql,all}: .[pifpaf]
21
-
18
+deps =
19
+    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
20
+    -r{toxinidir}/test-requirements.txt
21
+    -r{toxinidir}/requirements.txt
22 22
 commands =
23 23
   {env:PIFPAF_MYSQL:} {env:PIFPAF_POSTGRESQL:} {env:BASECOMMAND:} '{posargs}'
24 24
 

Loading…
Cancel
Save