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

tools/installer: switch to upstream PyInstaller #851

Merged
merged 2 commits into from
Feb 23, 2023

Conversation

rokm
Copy link
Member

@rokm rokm commented Jan 3, 2023

Exclude GStreamer plugins via corresponding hook configuration option that was introduced in PyInstaller 5.4. Switch to upstream PyInstaller release instead of using private fork.

Copy link
Member

@sjohannes sjohannes left a comment

Choose a reason for hiding this comment

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

Off-topic, but I wonder if it's possible to add this .spec file to our Black run.

tools/installer/exaile.spec Outdated Show resolved Hide resolved
Comment on lines -67 to -72
def _exclude(b):
for r in to_remove:
if r in b and 'libgstvideo-1' not in b:
print("Excluding", b)
return True
return False
Copy link
Member

Choose a reason for hiding this comment

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

I don't remember what this is for; is it not needed anymore?

Copy link
Member Author

Choose a reason for hiding this comment

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

This is how we were removing the unwanted gstreamer plugins up until now; it is part of the assemble_hook function, which was executed by our modified PyInstaller before performing binary analysis.

The same can now be achieved by explicitly filtering gstreamer plugins via PyInstaller's hook configuration.

Exclude GStreamer plugins via corresponding hook configuration
option that was introduced in PyInstaller 5.4. Switch to upstream
PyInstaller release instead of using private fork.
Include exaile.spec file in auto-formatting and formatting check
via black auto-formatter.
@rokm
Copy link
Member Author

rokm commented Jan 4, 2023

This should now collect (or rather, exclude) the same plugins as the old approach.

@rokm rokm marked this pull request as ready for review January 4, 2023 12:55
@luzip665 luzip665 merged commit cbafae0 into exaile:master Feb 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants