Merge branch 'dev'

lemieuxl · Aug 14, 2015 · 4bfd576 · 4bfd576
2 parents 613804d + 4882f48
commit 4bfd576
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pyplink/pyplink.py b/pyplink/pyplink.py
@@ -30,6 +30,8 @@
 import numpy as np
 import pandas as pd
 
+from six.moves import range
+
 
 __author__ = "Louis-Philippe Lemieux Perreault"
 __copyright__ = "Copyright 2014 Louis-Philippe Lemieux Perreault"

diff --git a/pyplink/tests/test_pyplink.py b/pyplink/tests/test_pyplink.py
@@ -39,6 +39,8 @@
 import numpy as np
 import pandas as pd
 
+from six.moves import range
+
 from ..pyplink import PyPlink
 
 

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 MAJOR = 1
 MINOR = 0
-MICRO = 0
+MICRO = 1
 VERSION = "{}.{}.{}".format(MAJOR, MINOR, MICRO)
 
 
@@ -57,7 +57,8 @@ def setup_package():
         packages=["pyplink", "pyplink.tests"],
         package_data={"pyplink.tests": ["data/test_data.*"], },
         test_suite="pyplink.tests.test_suite",
-        install_requires=["numpy >= 1.8.2", "pandas >= 0.14.1"],
+        install_requires=["numpy >= 1.8.2", "pandas >= 0.14.1",
+                          "six >= 1.9.0"],
         classifiers=["Operating System :: POSIX :: Linux",
                      "Operating System :: MacOS :: MacOS X",
                      "Operating System :: Microsoft",