Merge pull request #388 from simphony/fix-numpy-dependency

Fixed setup script and dependencies.

dev_requirements.txt

@@ -1,14 +1,11 @@
-enum34 >= 1.0.4
-tables >= 3.1.1
-stevedore >= 1.2.0
+git+https://github.com/simphony/simphony-metaparser.git@master#egg=simphony_metaparser
 click >= 3.3
 pyyaml >= 3.11
 sphinx >= 1.3.1
 tabulate >= 0.7.4
 mock==1.0.1
 coverage
 flake8<3
-numpy >= 1.4.1
 hypothesis
 # Pinned because older versions return status 2 for successful
 # operation, which is considered an error by setup.py

requirements.txt

@@ -1,2 +1,6 @@
 numexpr
-git+https://github.com/simphony/simphony-metaparser.git@master#egg=simphony_metaparser
+enum34 >= 1.0.4
+tables >= 3.1.1
+stevedore >= 1.2.0
+# Pinned. Apparently 1.12 has problems compiling on Adham's platform
+numpy==1.11.1

setup.py

@@ -132,14 +132,17 @@ def write_version_py(filename=None):
     description='The native implementation of the SimPhoNy cuds objects',
     long_description=README_TEXT,
     install_requires=[
-        "enum34>=1.0.4",
-        "stevedore>=1.2.0",
-        "numpy>=1.11.1",
-        "simphony_metaparser>=0.1.0"
+        "enum34 >= 1.0.4",
+        "stevedore >= 1.2.0",
+        "numpy ~= 1.11",
         ],
     extras_require={
         'H5IO': ["tables>=3.1.1"],
-        'CUBAGen': ["click >= 3.3", "pyyaml >= 3.11"]},
+        'CUBAGen': [
+            "simphony_metaparser >= 0.1.0",
+            "click >= 3.3",
+            "pyyaml >= 3.11"
+            ]},
     packages=find_packages(),
     cmdclass={
         'build_meta': BuildMeta,