From 70dd2f44d8d65b05330b34fe21031d2db03f4044 Mon Sep 17 00:00:00 2001 From: Fabio Verboso Date: Mon, 21 Nov 2016 12:06:01 +0100 Subject: [PATCH] requirements for the installation updated Change-Id: I5ae2ba276cd7e2028939e0e6a0a91c91c85e5df0 --- requirements.txt | 15 ++++++++++++++- test-requirements.txt | 13 +++++++++++++ tox.ini | 18 ++++++++++++++---- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 148f58d..640a620 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,17 @@ # process, which may cause wedges in the gate later. pbr>=1.6 # Apache-2.0 -oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0 \ No newline at end of file +oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0 +eventlet!=0.18.3,>=0.18.2 # MIT +oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 +oslo.log>=3.11.0 # Apache-2.0 +oslo.concurrency>=3.8.0 # Apache-2.0 +oslo.policy>=1.15.0 # Apache-2.0 +oslo.messaging>=5.2.0 # Apache-2.0 +oslo.db!=4.13.1,!=4.13.2,>=4.11.0 # Apache-2.0 +pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD +#paramiko>=2.0 # LGPLv2.1+ +keystonemiddleware!=4.5.0,>=4.2.0 # Apache-2.0 +autobahn>=0.10.1 # MIT License +#Twisted>=16.5.0 # MIT +WSME>=0.8 # MIT \ No newline at end of file diff --git a/test-requirements.txt b/test-requirements.txt index 52a2353..fe73c84 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,3 +12,16 @@ oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT +eventlet!=0.18.3,>=0.18.2 # MIT +oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 +oslo.log>=3.11.0 # Apache-2.0 +oslo.concurrency>=3.8.0 # Apache-2.0 +oslo.policy>=1.15.0 # Apache-2.0 +oslo.messaging>=5.2.0 # Apache-2.0 +oslo.db!=4.13.1,!=4.13.2,>=4.11.0 # Apache-2.0 +pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD +#paramiko>=2.0 # LGPLv2.1+ +keystonemiddleware!=4.5.0,>=4.2.0 # Apache-2.0 +autobahn>=0.10.1 # MIT License +#Twisted>=16.5.0 # MIT +WSME>=0.8 # MIT \ No newline at end of file diff --git a/tox.ini b/tox.ini index c45f9bb..9f4d32d 100644 --- a/tox.ini +++ b/tox.ini @@ -5,11 +5,21 @@ skipsdist = True [testenv] usedevelop = True -install_command = pip install -U {opts} {packages} -setenv = - VIRTUAL_ENV={envdir} +# tox is silly... these need to be separated by a newline.... +whitelist_externals = bash + find + rm +install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} +setenv = VIRTUAL_ENV={envdir} + LANGUAGE=en_US + LC_ALL=en_US.utf-8 deps = -r{toxinidir}/test-requirements.txt -# commands = python setup.py test --slowest --testr-args='{posargs}' +commands = + find . -type f -name "*.pyc" -delete + +[testenv:py27] +commands = + {[testenv]commands} [testenv:pep8] commands = flake8 {posargs}