Fixed Python 2 setup. Closes catherinedevlin#117.

catherinedevlin · catherinedevlin · commit 4dc2c090f562 · 2018-09-02T21:56:06.000-04:00
diff --git a/NEWS.txt b/NEWS.txt
@@ -150,3 +150,8 @@ Deleted Plugin import left behind in 0.2.2
 * bugfix in executing column_local_vars (thanks tebeka)
 * pgspecial installation optional (thanks jstoebel and arjoe)
 * conceal passwords in connection strings (thanks jstoebel)
+
+0.3.9
+-----
+
+* Restored Python 2 compatibility (thanks tokenmathguy)
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -0,0 +1,4 @@
+psycopg2
+pandas
+pytest
+
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,6 @@
+prettytable
+ipython>=1.0
+sqlalchemy>=0.6.7
+sqlparse
+six
+ipython-genutils>=0.1.0
diff --git a/setup.py b/setup.py
@@ -1,3 +1,4 @@
+from io import open
 from setuptools import setup, find_packages
 import os
 
diff --git a/src/tests/run_tests.sh b/src/tests/run_tests.sh
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,9 @@
+[tox]
+envlist = py27,py36
+
+[testenv]
+deps = pytest
+       -rrequirements.txt
+       -rrequirements-dev.txt
+commands =
+    ipython -c "import pytest; pytest.main(['.'])"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +psycopg2
 +pandas
 +pytest
++
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+from io import open`
`1`	`2`	`from setuptools import setup, find_packages`
`2`	`3`	`import os`
`3`	`4`