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

Merge with distutils@129480b #3475

Merged
merged 32 commits into from
Jul 31, 2022
Merged

Merge with distutils@129480b #3475

merged 32 commits into from
Jul 31, 2022

Conversation

jaraco
Copy link
Member

@jaraco jaraco commented Jul 31, 2022

  • Move import of _msvccompiler into the imports section. Skip only those tests that fail based on winreg.
  • Remove test suite construction in distutils.tests
  • Remove unittest cruft
  • Replace EnvironGuard with a pytest fixture.
  • DOC: Extend Windows rpath error message with likely cause
  • Implement ZLIB_SUPPORT as a pytest fixture.
  • 👹 Feed the hobgoblins (delint).
  • ⚫ Fade to black.
  • Extract expected values into a single list.
  • 👹 Feed the hobgoblins (delint).
  • 👹 Feed the hobgoblins (delint).
  • 👹 Feed the hobgoblins (delint).
  • 👹 Feed the hobgoblins (delint).
  • 👹 Feed the hobgoblins (delint).
  • 👹 Feed the hobgoblins (delint).
  • 👹 Feed the hobgoblins (delint).
  • 👹 Feed the hobgoblins (delint).
  • Replace if/else with simple algebra.
  • Consolidate 'format_command' and 'format_commands' now that order is retained in dicts.
  • Consolidate messaging when runtime_library_dirs is indicated.
  • Fix issue with Setuptools integration.
  • Rewrite comment in imperative voice. Use bulleted list for clarity. Short circuit when functionality isn't required, rather than leaving a dangling empty branch.
  • Extract _library_root to disentangle that concern from the other calculations.
  • Rewrite the comment to focus on the mechanics and not the author.
  • Eliminate repetition by iterating over the problem space.
  • Calculate the CFLAGS match early and simply include that in the choice on whether to change the root.
  • Assign result to a check and use that to consolidate return into a single expression.
  • ⚫ Fade to black.

Summary of changes

Closes

Pull Request Checklist

jaraco and others added 30 commits July 30, 2022 18:42
Extend the error message for attempting to call `runtime_library_dir_option` on Windows with the most likely way I have found to trigger the call, creating an `Extension` that specifies `runtime_library_dirs`.

Hopefully this will give users something to search for in their `setup.py` and a starting point for what to change.  Inspired by #3450.
DOC: Extend Windows rpath error message with likely cause
…hort circuit when functionality isn't required, rather than leaving a dangling empty branch.
…s a dictionary, but fall back to the dual dict/list model for compatibility with stdlib.
@jaraco jaraco merged commit ccb0666 into main Jul 31, 2022
@jaraco jaraco deleted the distutils-129480b branch July 31, 2022 23:33
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.

4 participants