Merge pull request #36 from opesci/compressionV2

Move dependencies to setup.py install_requires

pyrevolve/crevolve.pyx

@@ -1,9 +1,11 @@
+# cython: language_level=2
+
 cimport revolve_c
 
 from enum import Enum
 import warnings
 
-from tools import OutputGrabber
+from .tools import OutputGrabber
 
 
 class RevolveError(Exception):

pyrevolve/revolve_c.pxd

@@ -1,3 +1,4 @@
+# cython: language_level=3
 cdef extern from "../include/revolve_c.h":
     ctypedef enum CACTION:
         CACTION_ADVANCE,

requirements.txt

@@ -1,8 +1,2 @@
-cython>=0.17
+.
 flake8
-versioneer
-pytest
-blosc
-contexttimer
-pyzfp
-

setup.py

@@ -34,13 +34,14 @@ def extensions():
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
-with open('requirements.txt') as f:
-    required = f.read().splitlines()
+s_required = ["cython>=0.17", "versioneer"]
+i_required = ["blosc", "contexttimer", "pyzfp~=0.2rc1"]
 
 configuration = {
     'name': 'pyrevolve',
     'packages': ["pyrevolve"],
-    'setup_requires': required,
+    'setup_requires': s_required,
+    'install_requires': i_required,
     'ext_modules': lazy_cythonize(extensions),
     'version': versioneer.get_version(),
     'cmdclass': versioneer.get_cmdclass(),
@@ -51,6 +52,7 @@ def extensions():
     'author': "Imperial College London",
     'author_email': '[email protected]',
     'license': 'MIT',
+    'zip_safe': False
 }