stop using tox_install.sh

Duplicate the dependencies that are listed in extras and place them in
a test-requirements.txt file so we can install them using the
constraints list.

In order to add the new requirements file, we have to make the constraints
and requirements match each other and the global settings.

Change-Id: I4dae402fe37015f0f512d5e9a6426d5f39526347
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2018-04-17 16:45:10 -04:00
parent f244549fae
commit 0124bf4919
5 changed files with 46 additions and 8 deletions

View File

@ -16,7 +16,7 @@ kazoo>=2.2 # Apache-2.0
zake>=0.1.6 # Apache-2.0
redis>=2.10.0 # MIT
eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
eventlet!=0.18.3,!=0.20.1,!=0.21.0 # MIT
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
alembic>=0.8.10 # MIT
SQLAlchemy-Utils>=0.30.11 # BSD License

View File

@ -11,14 +11,16 @@ debtcollector==1.2.0
decorator==3.4.0
doc8==0.6.0
docutils==0.11
enum34==1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'
eventlet==0.18.2
extras==1.0.0
fasteners==0.7.0
fixtures==3.0.0
flake8==2.2.4
futures==3.0.0;python_version=='2.7' or python_version=='2.6'
futurist==1.2.0
greenlet==0.4.10
hacking==0.10.3
hacking==0.10.0
imagesize==0.7.1
iso8601==0.1.11
Jinja2==2.10
@ -62,12 +64,12 @@ requestsexceptions==1.2.0
restructuredtext-lint==1.1.1
six==1.10.0
snowballstemmer==1.2.1
Sphinx==1.6.5
Sphinx==1.6.2
sphinxcontrib-websupport==1.0.1
SQLAlchemy==1.0.10
SQLAlchemy-Utils==0.30.11
SQLAlchemy==1.0.10
stevedore==1.20.0
tenacity==3.2.1
tenacity==4.4.0
testrepository==0.0.18
testscenarios==0.4
testtools==2.2.0

View File

@ -57,6 +57,8 @@ taskflow.engines =
workers = taskflow.engines.worker_based.engine:WorkerBasedActionEngine
[extras]
# NOTE(dhellmann): The entries in this section of the file need to be
# kept consistent with the entries in test-requirements.txt.
zookeeper =
kazoo>=2.2 # Apache-2.0
zake>=0.1.6 # Apache-2.0
@ -65,7 +67,7 @@ redis =
workers =
kombu!=4.0.2,>=4.0.0 # BSD
eventlet =
eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
eventlet!=0.18.3,!=0.20.1,!=0.21.0 # MIT
database =
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
alembic>=0.8.10 # MIT

33
test-requirements.txt Normal file
View File

@ -0,0 +1,33 @@
# NOTE(dhellmann): This file contains duplicate dependency information
# that is also present in the "extras" section of setup.cfg, and the
# entries need to be kept consistent.
# zookeeper
kazoo>=2.2 # Apache-2.0
zake>=0.1.6 # Apache-2.0
# redis
redis>=2.10.0 # MIT
# workers
kombu!=4.0.2,>=4.0.0 # BSD
# eventlet
eventlet!=0.18.3,!=0.20.1,!=0.21.0 # MIT
# database
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
alembic>=0.8.10 # MIT
SQLAlchemy-Utils>=0.30.11 # BSD License
PyMySQL>=0.7.6 # MIT License
psycopg2>=2.6.2 # LGPL/ZPL
# test
pydotplus>=2.0.2 # MIT License
hacking<0.11,>=0.10.0
oslotest>=3.2.0 # Apache-2.0
mock>=2.0.0 # BSD
testtools>=2.2.0 # MIT
testscenarios>=0.4 # Apache-2.0/BSD
doc8>=0.6.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD

View File

@ -16,11 +16,12 @@ setenv =
VIRTUAL_ENV={envdir}
BRANCH_NAME=master
CLIENT_NAME=taskflow
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
# We need to install a bit more than just `test' because those drivers have
# custom tests that we always run
deps =
.[test,workers,zookeeper,database,redis,eventlet]
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
commands =
python setup.py testr --slowest --testr-args='{posargs}'