openstack
/
monasca-agent
Code Issues Proposed changes

Change tox.ini to not install requirements using global requirements 

Also add constraints on each library in requirements.txt

Change-Id: If93862e438e5e724fb5fb94296ae7879411a5cd4
This commit is contained in:
Kaiyan Sheng 2016-07-12 12:28:07 -06:00
parent b004344dc5
commit 4d1ab9b338
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
requirements.txt
View File

@ -1,18 +1,18 @@
requests requests>=2.7.0,<=2.10.0
oslo.config oslo.config<=3.12.0
oslo.utils oslo.utils<=3.15.0
oslo.vmware oslo.vmware>=1.16.0,<=2.10.0
PyYAML PyYAML>=3.1.0,<=3.11
gevent gevent>=1.1.1
httplib2 httplib2>=0.7.5,<=0.9.2
netaddr netaddr>=0.7.12,<=0.7.18,!=0.7.16
ntplib>=0.3.2,<0.4 ntplib>=0.3.2,<0.4
#psutil>=2.2.1,<3.1.0 psutil>=3.0.0,<3.1.0
pymongo pymongo>=3.0.2,<=3.2.2,!=3.1
python-memcached python-memcached>=1.56,<=1.58
python-monascaclient>=1.0.30 # Apache-2.0 python-monascaclient>=1.0.30 # Apache-2.0
redis redis>=2.10.0,<=2.10.5
supervisor>=3.1.3,<3.2 supervisor>=3.1.3,<3.2
tornado tornado>=4.3

4
tox.ini
View File

@ -5,8 +5,7 @@ skipsdist = True
[testenv] [testenv]
usedevelop = True usedevelop = True
install_command = install_command = pip install -U {opts} {packages}
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
setenv = setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
DISCOVER_DIRECTORY=tests DISCOVER_DIRECTORY=tests
@ -15,7 +14,6 @@ deps = -r{toxinidir}/requirements.txt
whitelist_externals = bash whitelist_externals = bash
find find
commands = commands =
pip install psutil==3.0.1
find . -type f -name "*.pyc" -delete find . -type f -name "*.pyc" -delete
nosetests -w tests/ -e tests_to_fix nosetests -w tests/ -e tests_to_fix