Repository navigation
Conversation
Move the EDL implementation into the package, retain the source launcher, and remove tool import symlinks. Make CLI entry points safe to import and callable without arguments. Restrict package discovery and add wheel/sdist installation checks for Windows and Unix. Refs: bkerler#830 (Python packaging stage)
Run source launchers in a dependency-only virtual environment and assert edlclient is not importable before execution. Keep wheel installation checks in a separate environment, and add the source root for qc_diag only during direct script execution.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix Python package installation on Windows, where
edlclient/edl.pycan be installed as a regular file containing../edl.pyinstead of a valid Python module.This causes the
edlconsole entry point to fail with aSyntaxErrorafter an otherwise successfulpipxinstallation.The changes also fix several CLI entry-point issues and preserve direct execution from a source checkout.
Changes
edlclient/edl.pyas a regular Python file, keeping the rootedl.pyas a compatibility launcher.Tools/LibraryandTools/Configsymlinks and update the affected imports.run()to avoid executing it during module imports.console_scripts, includingsierrakeygenandfhloaderparse.edlclientand its subpackages.Testing
All four platform/Python combinations passed locally:
Each combination passed all three packaging tests, covering:
edlclientpackage.No physical device operations were tested.
Related to #830. This PR addresses the Python packaging part; dependency declarations and installation scripts are handled separately.