Permalink
Browse files

Also adjust tox.ini, and fix an oversight

  • Loading branch information...
1 parent 0336cb8 commit c58f0f75c8b86b6421f76994689f3bb5beccc2bd @rkruppe rkruppe committed Sep 28, 2012
Showing with 4 additions and 7 deletions.
  1. +1 −1 paver/doctools.py
  2. +3 −6 tox.ini
View
@@ -121,7 +121,7 @@ def __init__(self, filename=None, from_string=None):
self.contents = []
self.sections = {}
if from_string is not None:
- from six import StringIO
+ from paver.deps.six import StringIO
self._read_file(StringIO(from_string))
else:
with open(filename) as f:
View
@@ -7,15 +7,12 @@
envlist = py25, py26, py27, pypy, py32
[testenv]
-deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements.txt
downloadcache = .pip-download-cache
commands = python setup.py test
[testenv:py25]
-deps = -r{toxinidir}/requirements-25.txt
- -r{toxinidir}/test-requirements.txt
+deps = -r{toxinidir}/test-requirements-25.txt
[testenv:py32]
-deps = -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements-3.txt
+deps = -r{toxinidir}/test-requirements-3.txt

0 comments on commit c58f0f7

Please sign in to comment.