Fix incorrect requirements. (#661)

silee2 · diyessi · commit 3b981907d9f6 · 2018-03-16T14:26:30.000-07:00
diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,3 +1,3 @@
-numpy==1.13.1
+six
+numpy
 typing
-
diff --git a/python/setup.py b/python/setup.py
@@ -227,11 +227,8 @@ def build_extensions(self):
         build_ext.build_extensions(self)
 
 
-requirements = [
-    "setuptools",
-    "six",
-    "numpy" 
-]
+with open('requirements.txt') as req:
+    requirements = req.read().splitlines()
 
 
 setup(
diff --git a/python/setup.py.in b/python/setup.py.in
@@ -238,11 +238,8 @@ class BuildExt(build_ext):
         build_ext.build_extensions(self)
 
 
-requirements = [
-    "setuptools",
-    "six",
-    "numpy",
-]
+with open('${CMAKE_SOURCE_DIR}/requirements.txt') as req:
+    requirements = req.read().splitlines()
 
 
 setup(
diff --git a/python/test_requirements.txt b/python/test_requirements.txt
@@ -1,5 +1,4 @@
 pytest
-numpy==1.13.1
 tox
 flake8
 flake8-commas

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 -numpy==1.13.1
 +six
 +numpy
 typing
+-