Merge pull request #25 from Yelp/ipython_27_compat

Support python 2.7, test against python 3.6 not 3.4
Yelp · Oct 9, 2017 · 8a8ac03 · 8a8ac03
2 parents d1c60c6 + 1260d9f
commit 8a8ac03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,7 +1,7 @@
 -r requirements.txt
 coverage
 flake8
-ipython
+ipython < 6.0.0  # 6.0 drops support for py27
 mock
 pre-commit>=0.4.2
 pytest

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, docs
+envlist = py27, py36, docs
 
 [testenv]
 deps = -rrequirements-dev.txt