Skip to content
New issue

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

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

Already on GitHub? # to your account

fix: update to support new pyinstaller 5.10 syntax #236

Merged
merged 1 commit into from
Apr 16, 2023
Merged

fix: update to support new pyinstaller 5.10 syntax #236

merged 1 commit into from
Apr 16, 2023

Conversation

andrewthetechie
Copy link
Contributor

#235 pyinstaller/pyinstaller#7560
This adds support for the new pyinstaller > 5.10 syntax for pyi_archive tocs.

@JonathonReinhart I tested this locally and it seems to be working and the pytests pass, but I'm not sure how I would add additional unit testing for this code.

#235
pyinstaller/pyinstaller#7560
This adds support for the new pytinstaller > 5.10 syntax for pyi_archive
tocs.
@JonathonReinhart JonathonReinhart merged commit 807bd17 into JonathonReinhart:master Apr 16, 2023
@JonathonReinhart
Copy link
Owner

Thanks @andrewthetechie for the fix! This passed tests locally (run_unit_tests.sh and test/run_all.sh).

You took care of the leg work of adapting to the new API; I can take care of the rest.

CI tests are totally broken right now (#124) anyway.

@andrewthetechie
Copy link
Contributor Author

Glad to help. I use staticx with Pyinstaller to build really small docker images of my python apps https://github.com/andrewthetechie/gha-repo-manager/blob/main/Docker/Dockerfile#L20

JonathonReinhart added a commit that referenced this pull request Apr 16, 2023
Where #236 adapted the new API to the old API with "if pre_510" checks,
this takes the opposite approach: Use the new API, and add an adapter
class to adapt the old API to the new.

Benefits:
- No more "if pre_510" checks in the middle of processing code.
- Removing the legacy behavior becomes trivial: delete the adapter.

Tested:
- git clean -fdx test/
- pip install pyinstaller==5.9
- ./test/run_all.sh
- pip install pyinstaller==5.10
- ./test/run_all.sh
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants