Merge branch 'master' into jennifer/contributing

38756397 · Scott Cyphers · GitHub · 08c142c4 · 3b981907 · 38756397
Unverified Commit 38756397 authored Mar 16, 2018 by Scott Cyphers Committed by GitHub Mar 16, 2018
Showing with 6 additions and 13 deletions

requirements.txt python/requirements.txt +2 -2

setup.py python/setup.py +2 -5

setup.py.in python/setup.py.in +2 -5

test_requirements.txt python/test_requirements.txt +0 -1

No files found.
--- a/python/requirements.txt
+++ b/python/requirements.txt
-numpy==1.13.1
+six
+numpy
 typing
-
--- a/python/setup.py
+++ b/python/setup.py
@@ -227,11 +227,8 @@ class BuildExt(build_ext):
        build_ext.build_extensions(self)


-requirements = [
-    "setuptools",
-    "six",
-    "numpy" 
-]
+with open('requirements.txt') as req:
+    requirements = req.read().splitlines()


 setup(

--- 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(

--- a/python/test_requirements.txt
+++ b/python/test_requirements.txt
 pytest
-numpy==1.13.1
 tox
 flake8
 flake8-commas