x/quark
Code Issues Proposed changes

Merge pull request #332 from Cerberus98/master

Browse Source 
Fixes building the tox venv after upstream change
This commit is contained in:
Meow Purrpurr
2015-02-11 18:17:58 -06:00
parent d37d462bbf c0f94e2387
commit ae825060dc
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -2,6 +2,8 @@ language: python
python: python:
- "2.7" - "2.7"
- "2.6" - "2.6"
before_install:
- "export NO_EVENTLET=1"
install: install:
- pip install -r requirements.txt -r test-requirements.txt . --use-mirrors - pip install -r requirements.txt -r test-requirements.txt . --use-mirrors
before_script: before_script:

1
tox.ini
View File

@@ -9,6 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_SHOW_ELAPSED=1
NOSE_OPENSTACK_STDOUT=1 NOSE_OPENSTACK_STDOUT=1
NO_EVENTLET=1
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = nosetests {posargs} commands = nosetests {posargs}