aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--requirements.txt2
-rw-r--r--tox.ini32
2 files changed, 23 insertions, 11 deletions
diff --git a/requirements.txt b/requirements.txt
index 9e2e9ae4..c596890d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,4 @@
Django==1.2.4
wsgiref==0.1.2
coverage==3.4
-PyYaml==3.10
+Pyyaml==3.10
diff --git a/tox.ini b/tox.ini
index 47bb3880..5a906533 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,7 @@ deps=
django==1.2.4
coverage==3.4
unittest-xml-reporting==1.2
+ Pyyaml==3.10
[testenv:py26-django12]
basepython=python2.6
@@ -36,6 +37,7 @@ deps=
django==1.2.4
coverage==3.4
unittest-xml-reporting==1.2
+ Pyyaml==3.10
[testenv:py27-django12]
basepython=python2.7
@@ -43,28 +45,32 @@ deps=
django==1.2.4
coverage==3.4
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
[testenv:py25-django13]
basepython=python2.5
deps=
django==1.3
coverage==3.4
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
[testenv:py26-django13]
basepython=python2.6
deps=
django==1.3
coverage==3.4
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
[testenv:py27-django13]
basepython=python2.7
deps=
django==1.3
coverage==3.4
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
####################################### EXAMPLES ################################################
[testenv:py25-django12e]
@@ -79,7 +85,8 @@ deps=
httplib2==0.6.0
Markdown==2.0.3
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
[testenv:py26-django12e]
basepython=python2.6
commands=
@@ -92,7 +99,8 @@ deps=
httplib2==0.6.0
Markdown==2.0.3
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
[testenv:py27-django12e]
basepython=python2.7
commands=
@@ -105,7 +113,8 @@ deps=
httplib2==0.6.0
Markdown==2.0.3
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
[testenv:py25-django13e]
basepython=python2.5
commands=
@@ -118,7 +127,8 @@ deps=
httplib2==0.6.0
Markdown==2.0.3
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
[testenv:py26-django13e]
basepython=python2.6
commands=
@@ -131,7 +141,8 @@ deps=
httplib2==0.6.0
Markdown==2.0.3
unittest-xml-reporting==1.2
-
+ Pyyaml==3.10
+
[testenv:py27-django13e]
basepython=python2.7
commands=
@@ -143,4 +154,5 @@ deps=
Pygments==1.4
httplib2==0.6.0
Markdown==2.0.3
- unittest-xml-reporting==1.2 \ No newline at end of file
+ unittest-xml-reporting==1.2
+ Pyyaml==3.10 \ No newline at end of file