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

Maintenance: Python version usage #4524

Merged
merged 1 commit into from
May 10, 2024
Merged

Conversation

mwichmann
Copy link
Collaborator

Simplify/clarify some usage of Python version strings. Dropped a couple which refer to unsupported versions.

While looking at version usage, it became clear one of the SWIG tests wasn't doing the right thing - it has a special case for Windows, where the way the path to the Python library is constructed would only work for the python.org release, not the Store version. Since we compute this information correctly in the test framework, and the test already called that routine - before ignoring the results - just use that instead. Though it turns out the framework didn't quite do the right thing either, returning a bare lib name without the library suffix - that change was also added.

Contributor Checklist:

  • I have created a new test or updated the unit tests to cover the new/changed functionality.
  • I have updated CHANGES.txt (and read the README.rst)
  • I have updated the appropriate documentation

Simplify/clarify some usage of Python version strings.  Dropped a couple
which refer to unsupported versions.

While looking at version usage, it became clear one of the SWIG tests
wasn't doing the right thing - it has a special case for Windows, where
the way the path to the Python library is constructed would only work
for the python.org release, not the Store version.  Since we compute
this information correclty in the test framework, and the test already
called that routine - before ignoring the results - just use that instead.
Though it turns out the framework didn't quite do the right thing either,
returning a bare lib name without the library suffix - fixed that, too.

Signed-off-by: Mats Wichmann <[email protected]>
@bdbaddog bdbaddog merged commit c0f742e into SCons:master May 10, 2024
6 of 7 checks passed
@mwichmann mwichmann added the maintenance Tasks to maintain internal SCons code/tools label May 10, 2024
@mwichmann mwichmann added this to the 4.8 milestone May 10, 2024
@mwichmann mwichmann deleted the maint/py-versions branch May 10, 2024 22:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Tasks to maintain internal SCons code/tools
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants