1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff --unified --recursive --text pylsl-1.10.4/MANIFEST.in pylsl-1.10.4.nolibs/MANIFEST.in
--- pylsl-1.10.4/MANIFEST.in 2015-04-24 20:51:56.000000000 -0500
+++ pylsl-1.10.4.nolibs/MANIFEST.in 2019-07-28 22:05:54.866765165 -0500
@@ -1,6 +1,2 @@
include DESCRIPTION.rst
include LICENSE
-
-# If using Python 2.6 or less, then have to include package data, even though
-# it's already declared in setup.py
-include pylsl/liblsl*.*
Only in pylsl-1.10.4/pylsl: liblsl32.dll
Only in pylsl-1.10.4/pylsl: liblsl32.dylib
Only in pylsl-1.10.4/pylsl: liblsl32.so
Only in pylsl-1.10.4/pylsl: liblsl64.dll
Only in pylsl-1.10.4/pylsl: liblsl64.dylib
Only in pylsl-1.10.4/pylsl: liblsl64.so
diff --unified --recursive --text pylsl-1.10.4/pylsl/pylsl.py pylsl-1.10.4.nolibs/pylsl/pylsl.py
--- pylsl-1.10.4/pylsl/pylsl.py 2015-05-03 20:04:18.000000000 -0500
+++ pylsl-1.10.4.nolibs/pylsl/pylsl.py 2019-07-28 22:05:20.222839962 -0500
@@ -1141,7 +1141,9 @@
if not os.path.isfile(libpath):
libpath = util.find_library(libname)
if not libpath:
- raise RuntimeError("library " + libname + " was not found - make sure "
+ libpath = util.find_library('lsl')
+ if not libpath:
+ raise RuntimeError("library " + libname + " was not found - make sure "
"that it is on the search path (e.g., in the same "
"folder as pylsl.py).")
lib = CDLL(libpath)
diff --unified --recursive --text pylsl-1.10.4/pylsl.egg-info/SOURCES.txt pylsl-1.10.4.nolibs/pylsl.egg-info/SOURCES.txt
--- pylsl-1.10.4/pylsl.egg-info/SOURCES.txt 2015-05-03 20:06:40.000000000 -0500
+++ pylsl-1.10.4.nolibs/pylsl.egg-info/SOURCES.txt 2019-07-28 22:05:43.563238559 -0500
@@ -5,12 +5,6 @@
setup.cfg
setup.py
pylsl/__init__.py
-pylsl/liblsl32.dll
-pylsl/liblsl32.dylib
-pylsl/liblsl32.so
-pylsl/liblsl64.dll
-pylsl/liblsl64.dylib
-pylsl/liblsl64.so
pylsl/pylsl.py
pylsl.egg-info/PKG-INFO
pylsl.egg-info/SOURCES.txt
diff --unified --recursive --text pylsl-1.10.4/setup.py pylsl-1.10.4.nolibs/setup.py
--- pylsl-1.10.4/setup.py 2015-05-03 20:04:30.000000000 -0500
+++ pylsl-1.10.4.nolibs/setup.py 2019-07-28 22:06:09.753583484 -0500
@@ -84,13 +84,6 @@
# $ pip install -e .[dev,test]
extras_require={},
- # If there are data files included in your packages that need to be
- # installed, specify them here. If using Python 2.6 or less, then these
- # have to be included in MANIFEST.in as well.
- package_data={
- 'pylsl': ['liblsl32.dll','liblsl64.dll','liblsl32.dylib','liblsl64.dylib','liblsl32.so','liblsl64.so'],
- },
-
# Although 'package_data' is the preferred approach, in some case you may
# need to place data files outside of your packages. See:
# http://docs.python.org/3.4/distutils/setupscript.html#installing-additional-files # noqa
|