Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Find more liblsl variants #18

Merged
merged 13 commits into from
Nov 18, 2019
Merged

Find more liblsl variants #18

merged 13 commits into from
Nov 18, 2019

Conversation

tstenner
Copy link
Contributor

This PR searches a bit harder for liblsl, namely liblsl with or without debug suffices (-debug), bitness suffices (32, 64 depending on the platform) and in the pylsl.py directory and the default system search path.

Also, users can set the PYLSL_LIB environment variable (see #13) to load a specific library.

@tstenner tstenner requested a review from cboulay August 15, 2019 11:16
Copy link
Contributor

@cboulay cboulay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just the small change to move the if 'PYLSL_LIB' block to the top of the function. Other than that it looks good.

pylsl/pylsl.py Outdated Show resolved Hide resolved
pylsl/pylsl.py Outdated Show resolved Hide resolved
@cboulay
Copy link
Contributor

cboulay commented Aug 23, 2019

Have you fixed the CI builds since this PR?

@tstenner tstenner force-pushed the libfinder branch 3 times, most recently from 1c9ab32 to 7ac55cf Compare August 29, 2019 15:05
@tstenner
Copy link
Contributor Author

The CI builds just fine now, I've also switched from full builds to the prebuilt binaries fron sccn/liblsl releases so the build is a lot faster now (6m->21s). I'm not sure if the tag is correct (cp27-cp27m-manylinux2010_x86_64). I've already set the python-tag to py3, but I'm hoping that you know the magic setup.py parameter to fix it :-)

@cboulay
Copy link
Contributor

cboulay commented Aug 30, 2019

I've never had to do anything to specify the tag because cibuildwheel takes care of that automatically. Specifying the tag manually won't make pypi accept it, it has to pass auditwheel.

@cboulay
Copy link
Contributor

cboulay commented Aug 30, 2019

I think you can just do auditwheel repair <wheelname.whl> and it will create a properly named wheel for you.

@tstenner tstenner force-pushed the libfinder branch 7 times, most recently from b342fe2 to c2c7261 Compare September 5, 2019 09:05
@tstenner
Copy link
Contributor Author

tstenner commented Sep 5, 2019

I removed the has_ext = True in the setup.py because even though not a pure python package it doesn't depend on a specific python version. bdist_wheel now generates the right packages automatically, so auditwheel doesn't have to do anything.

@tstenner tstenner self-assigned this Sep 5, 2019
@tstenner tstenner added the enhancement New feature or request label Sep 5, 2019
@tstenner
Copy link
Contributor Author

I checked the resulting package; auditwheel is happy:

pylsl-1.13.2-py2.py3-none-any.whl is consistent with the following
platform tag: "manylinux2010_x86_64".

The wheel references external versioned symbols in these system-
provided shared libraries: librt.so.1 with versions {'GLIBC_2.2.5'},
libm.so.6 with versions {'GLIBC_2.2.5'}, libgcc_s.so.1 with versions
{'GCC_3.3', 'GCC_4.2.0', 'GCC_3.3.1', 'GCC_3.0'}, libpthread.so.0 with
versions {'GLIBC_2.3.2', 'GLIBC_2.3.3', 'GLIBC_2.2.5'}, libc.so.6 with
versions {'GLIBC_2.7', 'GLIBC_2.4', 'GLIBC_2.3.2', 'GLIBC_2.9',
'GLIBC_2.3', 'GLIBC_2.2.5', 'GLIBC_2.8'}

Also, both Python 2.7, 3.4 and 3.7 from the manylinux2010 image can install the wheel produced by the CI and run the examples so I think we could merge it.

@tstenner
Copy link
Contributor Author

And I've added the manylinux1 builds.

@tstenner tstenner force-pushed the libfinder branch 10 times, most recently from 29a15f9 to 01ca15e Compare September 13, 2019 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants