summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-09-20 15:27:24 +0000
committerGerrit Code Review <review@openstack.org>2013-09-20 15:27:24 +0000
commit8e152992d4b634e8e346ee6271bf73f579807306 (patch)
treec849be9cf3966bb0e5868ea9f7095b102621927c
parentd4b06bab5659926ac8219f750361be4a5158420a (diff)
parent6a71811cd733224c7dfb0ed7c5c8f155cfe58976 (diff)
downloadoslosphinx-8e152992d4b634e8e346ee6271bf73f579807306.tar.gz
Merge "Update build config"1.1
-rw-r--r--test-requirements.txt1
-rw-r--r--tox.ini9
2 files changed, 5 insertions, 5 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index e69de29..f0dd00b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -0,0 +1 @@
+hacking>=0.5.6,<0.8
diff --git a/tox.ini b/tox.ini
index 585ccd4..273252f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
[tox]
+minversion = 1.6
+skipsdist = True
envlist = pep8
[testenv]
+usedevelop = True
+install_command = pip install {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
setenv = VIRTUAL_ENV={envdir}
@@ -9,11 +13,6 @@ sitepackages = False
downloadcache = {toxworkdir}/_download
[testenv:pep8]
-# Install bounded pep8/pyflakes first, then let flake8 install
-deps = pep8==1.4.5
- pyflakes==0.7.2
- flake8==2.0
- hacking>=0.5.6,<0.7
commands =
flake8 oslo