Merge pull request #35 from s-ccs/python38cythonfix

fix windows installation

Readme.md

@@ -39,6 +39,7 @@ If you are willing to run `edf2asc` on all your files, you can use:
 - Alex Kim
 - Greg Schwimer
 - Oscar Esteban
+- Richard Veale
 
 ## Setup
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pyedfread
-version = 0.3.0
+version = 0.3.1
 description = Read SR-Research EDF files.
 keywords = psychology, neuroscience
 license = BSD-2-Clause
@@ -14,8 +14,7 @@ install_requires =
     numpy
     pandas
     h5py
-package_dir =
-    = src
+package_dir = src
 packages = find:
 
 [options.package_data]

setup.py

@@ -9,9 +9,10 @@
 """
 
 import sys
-from distutils.core import setup
-from distutils.extension import Extension
+#from distutils.core import setup
+#from distutils.extension import Extension
 from Cython.Distutils import build_ext
+from setuptools import setup,find_packages, Extension
 import numpy
 
 
@@ -49,12 +50,14 @@
         "extra_link_args": ["-fopenmp"],
     }
 
-
+print(args)
 ext_module = Extension("pyedfread.edf_read", ["src/pyedfread/edf_read.pyx"], **args)
 
 ext_data = Extension("pyedfread.edf_data", ["src/pyedfread/edf_data.pyx"], **args)
 
 setup(
     cmdclass={'build_ext': build_ext},
     ext_modules=[ext_data, ext_module],
+    packages = find_packages(where='src'),
+    package_dir = {"": "src"},
 )

src/pyedfread/__init__.py

@@ -1,4 +1,17 @@
 """Read eye-tracking information from EyeLink EDF files."""
 
+
+import sys
+if sys.platform.startswith("win32"):
+    import os
+    import platform
+    srr_basedir = r"C:\Program Files (x86)\SR Research\EyeLink"
+    if platform.architecture()[0] == "64bit":
+        arch_dir = 'x64'
+    else:
+        arch_dir = ''
+    # due to a change in python 3.8, the searchpath is not automatically added anymore
+    os.add_dll_directory(os.path.join(srr_basedir, 'libs', arch_dir))
+
 from pyedfread.parse import read_edf
 from pyedfread.edf_read import read_preamble, read_messages, read_calibration