Try to fix pip build problem (#3041)

* Try to fix pip build problem * Revert "Try to fix pip build problem" This reverts commit 1dfd1e8. * Add cpp files to MANIFEST.in * Prepare for new release * Update requirements to match setup * Fix typo * Update setup.py * Move numpy requirements around.
gwastro · Dec 4, 2019 · 11f5fa4 · 11f5fa4
1 parent f11ba57
commit 11f5fa4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,5 +2,6 @@ include test/*test*py
 include bin/*
 recursive-include examples *py *sh *xml
 recursive-include tools *py
+recursive-include pycbc *cpp
 include descr.rst
 include LICENSE
diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,8 @@ decorator>=3.4.2
 scipy>=0.16.0; python_version >= '3.5'
 scipy>=0.16.0,<1.3.0; python_version <= '3.4'
 matplotlib>=2.0.0
-numpy>=1.13.0
+numpy>=1.16.0; python_version >= '3.5'
+numpy>=1.16.0,<1.17.0; python_version <= '3.4'
 pillow
 h5py<2.10.0
 jinja2

diff --git a/setup.py b/setup.py
@@ -38,6 +38,8 @@
 install_requires =  setup_requires + ['Mako>=1.0.1',
                       'cython>=0.29',
                       'decorator>=3.4.2',
+                      'numpy>=1.16.0; python_version >= "3.5"',
+                      'numpy>=1.16.0,<1.17.0; python_version <= "2.7"',
                       'scipy>=0.16.0; python_version >= "3.5"',
                       'scipy>=0.16.0,<1.3.0; python_version <= "3.4"',
                       'matplotlib>=1.5.1',
@@ -121,7 +123,7 @@ def __getattr__(self, attr):
         vinfo = _version_helper.generate_git_version_info()
     except:
         vinfo = vdummy()
-        vinfo.version = '1.15.0'
+        vinfo.version = '1.15.1'
         vinfo.release = 'True'
 
     with open('pycbc/version.py', 'w') as f: