Handle C extensions not inside a package directory (at the root) #39

natefoo · 2018-09-12T21:39:31Z

@matthew-brett how's this look for an implementation? It's working for me but needs a few tests.

Root packages end up with a .dylib<pkg> directory for delocated libs, this mirrors what auditwheel does.

matthew-brett/delocate#39

matthew-brett

Thanks - and sorry to be so slow to review, the start of term got the better of me.

matthew-brett · 2018-10-12T09:38:43Z

delocate/tools.py

@@ -382,8 +382,8 @@ def dir2zip(in_dir, zip_fname):
    z.close()


-def find_package_dirs(root_path):
-    """ Find python package directories in directory `root_path`
+def find_packages(root_path):


Sorry - I'm a little sensitive about changing the API without warning.

Would you mind making and deprecating something like:

def find_package_dirs(root_path): return [p for p, is_dir in find_packages(root) if is_dir]

and importing into delocating?

matthew-brett · 2018-10-12T09:39:52Z

delocate/tools.py

@@ -393,14 +393,17 @@ def find_package_dirs(root_path):
    Returns
    -------
    package_sdirs : set
-        Set of strings where each is a subdirectory of `root_path`, containing
-        an ``__init__.py`` file.  Paths prefixed by `root_path`
+        Set of strings where each is a subdirectory of `root_path` containing an


Actually a set of (string, is_dir) tuples no?

matthew-brett · 2018-10-12T09:47:24Z

delocate/tools.py

    """
    package_sdirs = set()
    for entry in os.listdir(root_path):
        fname = entry if root_path == '.' else pjoin(root_path, entry)
        if isdir(fname) and exists(pjoin(fname, '__init__.py')):
-            package_sdirs.add(fname)
+            package_sdirs.add((fname, True))
+        elif isfile(fname) and ((fname.endswith('.so') or fname.endswith('.dylib'))):


Use lib_filt_func here? See delocate_wheel docstring.

I'm not sure how to use lib_filt_func here - here we're not checking the dependencies of found objects, but only whether a member of root_path is a module. What would lib_filt_func is None mean in this context? It can't mean that every directory/file found is a package, nor should lib_filt_func == "dylibs-only" cause the function to ignore packages in subdirs.

Perhaps I should move _dylibs_only() to tools and use it here (and import it in delocating)?

I'm sure sure I understand, I might have been too hasty but lib_filt_func is to decide what files to consider when looking for libraries. I guess it's fine print. Yes, moving to tools sounds like a reasonable thing to do.

delocate/tools.py

asottile · 2019-01-04T20:37:51Z

looks like this has a conflict now -- I'm very interested in using this branch

matthew-brett · 2019-01-04T20:56:51Z

@natefoo - OK to rebase? I promise to review quickly.

asottile · 2019-01-04T20:58:26Z

the conflict is pretty trivial -- it's just mad about imports -- (can compare against https://github.com/asottile/delocate/tree/top-level-fix-squash_asottile)

natefoo · 2019-02-14T15:30:20Z

@matthew-brett ping, I rebased this (also feel free to modify directly).

ipmb · 2019-02-14T15:51:42Z

FWIW, I'm using this patch to build pyuwsgi wheels for Mac with success.

natefoo · 2019-04-24T17:00:09Z

@matthew-brett Anything I help with to get this over the line?

…single-file-refactor. Fixes macOS wheels. matthew-brett/delocate#39

asottile · 2020-03-22T17:48:38Z

reaching for this again -- unfortunately the conflict is pretty messy now so I'm having trouble rebasing this :(

bsolomon1124 · 2020-05-24T21:57:26Z

I'm working on rebasing this on a new branch in #74, but 9f042a8, which consisted of a refactor with libsana.py, is what's making that tedious.

- Incorporate 9f042a8 into pieces of PR matthew-brett#39 - Delegate to _analyze_path()

McSinyx · 2020-05-25T08:06:32Z

@bsolomon1124, thank you for continue working on this. BTW recently per pypa/auditwheel#90, auditwheel has just adopted the new naming scheme for dynamic libraries ({wheelname}.libs).

natefoo · 2021-09-21T19:46:51Z

Superseded by #123.

This was referenced Sep 14, 2018

Non-standard libs can't be bundled in macOS lincolnloop/pyuwsgi-wheels#2

Closed

Installed uwsgi not working in MacOS galaxyproject/galaxy#6470

Closed

natefoo force-pushed the top-level-fix-squash branch from 0dcf21e to 0667367 Compare October 8, 2018 17:33

ipmb added a commit to lincolnloop/pyuwsgi-wheels that referenced this pull request Oct 12, 2018

Use delocate fork

c581857

matthew-brett/delocate#39

ipmb added a commit to lincolnloop/pyuwsgi-wheels that referenced this pull request Oct 12, 2018

Use delocate fork

de3635c

matthew-brett/delocate#39

matthew-brett reviewed Oct 12, 2018

View reviewed changes

natefoo force-pushed the top-level-fix-squash branch from eac59ce to aa5c4ab Compare October 15, 2018 17:53

matthew-brett reviewed Oct 21, 2018

View reviewed changes

delocate/tools.py Show resolved Hide resolved

Handle C extensions not inside a package directory (at the root)

58106c6

natefoo force-pushed the top-level-fix-squash branch from aa5c4ab to 58106c6 Compare February 2, 2019 02:25

djhoese mentioned this pull request Jul 15, 2019

Fix Freetype linking bug with PyPi macOS wheels pytroll/aggdraw#59

Merged

matthew-brett mentioned this pull request Sep 14, 2019

delocate-wheel does not work for pybind11 project? #52

Closed

whtsky added a commit to whtsky/archi that referenced this pull request Nov 21, 2019

ci: use delocate from https://github.com/matthew-brett/delocate/tree/…

99e74b5

…single-file-refactor. Fixes macOS wheels. matthew-brett/delocate#39

whtsky mentioned this pull request Nov 21, 2019

ci: use delocate from https://github.com/matthew-brett/delocate/tree/… whtsky/archi#1

Merged

whtsky added a commit to whtsky/archi that referenced this pull request Nov 22, 2019

ci: use delocate from https://github.com/matthew-brett/delocate/tree/…

d600baf

…single-file-refactor. Fixes macOS wheels. matthew-brett/delocate#39

wjblanke added a commit to Chia-Network/delocate that referenced this pull request Apr 7, 2020

https://github.com/matthew-brett/delocate/pull/39

5ac80f0

matthew-brett mentioned this pull request May 3, 2020

Support fixing top-level extension modules #72

Closed

bsolomon1124 mentioned this pull request May 24, 2020

Build modernization (GHA, wheels, setuptools) yaml/pyyaml#407

Merged

bsolomon1124 added a commit to bsolomon1124/delocate that referenced this pull request May 24, 2020

Allow tree_libs() -> start_path to be a single module (file)

1d82333

- Incorporate 9f042a8 into pieces of PR matthew-brett#39 - Delegate to _analyze_path()

bsolomon1124 mentioned this pull request May 25, 2020

WIP: resolve PR #39 conflicts #74

Closed

HiromuHota mentioned this pull request Jun 3, 2020

Wheel for macOS requires Mecab to run polm/fugashi#18

Closed

ipmb mentioned this pull request Feb 12, 2021

Support Apple silicon lincolnloop/pyuwsgi-wheels#10

Closed

matthew-brett mentioned this pull request Sep 17, 2021

Dependencies not included on macOS after using delocate #121

Closed

HexDecimal mentioned this pull request Sep 21, 2021

Allow for delocating top level modules. #123

Merged

natefoo closed this Sep 21, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Handle C extensions not inside a package directory (at the root) #39

Handle C extensions not inside a package directory (at the root) #39

natefoo commented Sep 12, 2018

matthew-brett left a comment

matthew-brett Oct 12, 2018

matthew-brett Oct 12, 2018

matthew-brett Oct 12, 2018

natefoo Oct 15, 2018

matthew-brett Oct 15, 2018

asottile commented Jan 4, 2019

matthew-brett commented Jan 4, 2019

asottile commented Jan 4, 2019

natefoo commented Feb 14, 2019

ipmb commented Feb 14, 2019

natefoo commented Apr 24, 2019

asottile commented Mar 22, 2020

bsolomon1124 commented May 24, 2020 •

edited

Loading

McSinyx commented May 25, 2020

natefoo commented Sep 21, 2021

Handle C extensions not inside a package directory (at the root) #39

Handle C extensions not inside a package directory (at the root) #39

Conversation

natefoo commented Sep 12, 2018

matthew-brett left a comment

Choose a reason for hiding this comment

matthew-brett Oct 12, 2018

Choose a reason for hiding this comment

matthew-brett Oct 12, 2018

Choose a reason for hiding this comment

matthew-brett Oct 12, 2018

Choose a reason for hiding this comment

natefoo Oct 15, 2018

Choose a reason for hiding this comment

matthew-brett Oct 15, 2018

Choose a reason for hiding this comment

asottile commented Jan 4, 2019

matthew-brett commented Jan 4, 2019

asottile commented Jan 4, 2019

natefoo commented Feb 14, 2019

ipmb commented Feb 14, 2019

natefoo commented Apr 24, 2019

asottile commented Mar 22, 2020

bsolomon1124 commented May 24, 2020 • edited Loading

McSinyx commented May 25, 2020

natefoo commented Sep 21, 2021

bsolomon1124 commented May 24, 2020 •

edited

Loading