Browse Source

Install requirements during the correct tox phase

Glance isn't explicitly installing requirements, so add requirements
as tox deps in such a way that they'll be properly constrained by the
current openstack upper-constraints.

This change also bumps the version of psycopg to that of the current
upper-constraints in test-requirements and lower-constraints.  (The
version in our current lower-constraints is subject to the "could not
determine PostgreSQL version from '10.x'" error, which causes the
lower-constraints job to fail.)

Change-Id: I1bb5759e6b1e3f8545ab417617072a61323b59a7
Closes-bug: #1852356
changes/51/693951/2
Brian Rosmaita 3 weeks ago
parent
commit
d2d67ae3a1
3 changed files with 6 additions and 4 deletions
  1. +1
    -1
      lower-constraints.txt
  2. +1
    -1
      test-requirements.txt
  3. +4
    -2
      tox.ini

+ 1
- 1
lower-constraints.txt View File

@@ -87,7 +87,7 @@ pika-pool==0.1.3
pika==0.10.0
prettytable==0.7.1
psutil==3.2.2
psycopg2==2.6.2
psycopg2==2.8.4
pycadf==2.7.0
pycparser==2.18
pyflakes==0.8.1

+ 1
- 1
test-requirements.txt View File

@@ -27,7 +27,7 @@ doc8>=0.6.0 # Apache-2.0

# Optional packages that should be installed when testing
PyMySQL>=0.7.6 # MIT License
psycopg2>=2.6.2 # LGPL/ZPL
psycopg2>=2.8.4 # LGPL/ZPL
pysendfile>=2.0.0;sys_platform!='win32' # MIT
xattr>=0.9.2;sys_platform!='win32' # MIT
python-swiftclient>=3.2.0 # Apache-2.0

+ 4
- 2
tox.ini View File

@@ -18,8 +18,10 @@ setenv =
# clue for oslo.db to use file-based database.
OS_TEST_DBAPI_ADMIN_CONNECTION=sqlite:////tmp/placeholder-never-created-nor-used.db
usedevelop = True
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
deps = -r{toxinidir}/test-requirements.txt
install_command = pip install {opts} {packages}
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands =
find . -type f -name "*.pyc" -delete
whitelist_externals = bash

Loading…
Cancel
Save