From 4dc2c090f56268907e28fc48326632aa34bdceed Mon Sep 17 00:00:00 2001
From: Catherine Devlin <catherine.devlin@gmail.com>
Date: Sun, 2 Sep 2018 21:56:06 -0400
Subject: [PATCH] Fixed Python 2 setup.  Closes #117.

---
 NEWS.txt               | 5 +++++
 requirements-dev.txt   | 4 ++++
 requirements.txt       | 6 ++++++
 setup.py               | 1 +
 src/tests/run_tests.sh | 1 -
 tox.ini                | 9 +++++++++
 6 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 requirements-dev.txt
 create mode 100644 requirements.txt
 delete mode 100755 src/tests/run_tests.sh
 create mode 100644 tox.ini

diff --git a/NEWS.txt b/NEWS.txt
index 3e3642e..989c616 100644
--- 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)
\ No newline at end of file
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 0000000..b096622
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,4 @@
+psycopg2
+pandas
+pytest
+
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..5145782
--- /dev/null
+++ 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
index 8a8bed5..7047857 100644
--- 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
deleted file mode 100755
index fbd434f..0000000
--- a/src/tests/run_tests.sh
+++ /dev/null
@@ -1 +0,0 @@
-ipython -c "import nose; nose.run()"
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..bce18f2
--- /dev/null
+++ 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(['.'])"