Skip to content

Comments

Sync latest distutils#4103

Merged
jaraco merged 34 commits intomainfrom
feature/distutils-sync
Nov 18, 2023
Merged

Sync latest distutils#4103
jaraco merged 34 commits intomainfrom
feature/distutils-sync

Conversation

@jaraco
Copy link
Member

@jaraco jaraco commented Nov 8, 2023 •
edited
Loading

  • Rely on pytest as found in fix #10447 - consider marks in reverse mro order to give base classes priority pytest-dev/pytest#11155. Fixes test_bdist_ext tests started failing with pytest 7.2 distutils#186.
  • Clean up docstrings and remove crufty comments. Replace integer literals with booleans.
  • "Refactor to newer_group to utilize higher level constructs ("any"), re-use _newer logic, and avoid complexity in branching."
  • Prefer os.path.getmtime
  • Inline check for target presence.
  • Add test for newer_pairwise, bringing coverage in dep_util to 100%.
  • Replace for/append loop with a filter function (newer_pair).
  • Replace explicit list check with zip(strict=True). Allows inputs to be iterables.
  • Extract a 'starfilter', similar to itertools.starmap, to generalize the concept of filtering results over a sequence of tuples.
  • Replace '_starfilter' with 'jaraco.functools.splat'.
  • Move dep_util to _modified and mark dep_util as deprecated.
  • Extend tests for newer_pairwise and fix failed expectation when no files are newer.
  • Add newer_pairwise_group (inspired by setuptools.dep_util).
  • Added tests for newer_pairwise_group().
  • Modernize test_newer_pairwise_group by using tmp_path and a SimpleNamespace.
  • Remove latent references in docs.
  • Limit sphinxlint jobs to 1. Workaround for AttributeError: Can't get attribute '_check_file' on <module '__main__' (built-in)> sphinx-contrib/sphinx-lint#83.
  • Replace git version with released version. Ref recent windows tests fail (winbot) #186.
  • Disable cygwin tests for now. Ref test_cygwin job failing after adding ruff #3921
  • Disable integration test due to known breakage from deprecation warnings.
  • Allow diffcov to fail also, as it requires the tests to pass on the latest Python to succeed.
  • Remove newsfragment
  • Copy concurrency setting from setuptools
  • Rely on distutils._modified and deprecated setuptools.dep_util.
  • Add news fragment.

Summary of changes

Closes

Pull Request Checklist

jaraco and others added 30 commits July 1, 2023 18:20
@jaraco
Rely on pytest as found in pytest-dev/pytest#11155. Fixes pypa/distut…
5a8ca1b 
…ils#186.
@jaraco
Merge https://github.com/jaraco/skeleton into feature/skeleton
6e19647
@jaraco
Clean up docstrings and remove crufty comments. Replace integer liter…
4a70331 
…als with booleans.
@jaraco
"Refactor to newer_group to utilize higher level constructs ("any"), …
c4e27db 
…re-use _newer logic, and avoid complexity in branching."
@jaraco
Prefer os.path.getmtime
d7aa188
@jaraco
Inline check for target presence.
dfc8e60
@jaraco
Add test for newer_pairwise, bringing coverage in dep_util to 100%.
bdffb48
@jaraco
Replace for/append loop with a filter function (newer_pair).
0720b98
@jaraco
Replace explicit list check with zip(strict=True). Allows inputs to b…
131eff7 
…e iterables.
@jaraco
Extract a 'starfilter', similar to itertools.starmap, to generalize t…
4d82dc4 
…he concept of filtering results over a sequence of tuples.
@jaraco
Replace '_starfilter' with 'jaraco.functools.splat'.
5deb5ac
@jaraco
Move dep_util to _modified and mark dep_util as deprecated.
9494203
@jaraco
Extend tests for newer_pairwise and fix failed expectation when no fi…
ce9efc4 
…les are newer.
@jaraco
Add newer_pairwise_group (inspired by setuptools.dep_util).
2972e29
@jaraco
Added tests for newer_pairwise_group().
378d0d5 
Cherry-picked from a40114a.
@jaraco
Modernize test_newer_pairwise_group by using tmp_path and a SimpleNam…
501b753 
…espace.
@jaraco
Merge https://github.com/jaraco/skeleton into feature/skeleton
fe9018c
@jaraco
Remove latent references in docs.
6039322
@jaraco
Merge branch 'main' into feature/skeleton
cf6fb0c
@jaraco
Limit sphinxlint jobs to 1. Workaround for sphinx-contrib/sphinx-lint#83
03f03e7 
.
@jaraco
Merge https://github.com/jaraco/skeleton into feature/skeleton
4673d63
@jaraco
Replace git version with released version. Ref #186.
41b9cce
@jaraco
Disable cygwin tests for now. Ref #3921
d3e5de0
@jaraco
Merge branch 'main' into feature/skeleton
6ec501a
@jaraco
Disable integration test due to known breakage from deprecation warni…
d23e28a 
…ngs.
@jaraco
Merge branch 'main' into feature/skeleton
a49aff3
@jaraco
Allow diffcov to fail also, as it requires the tests to pass on the l…
03c6392 
…atest Python to succeed.
@jaraco
Remove newsfragment
6e6ee97
@jaraco
Merge pull request pypa/distutils#217 from pypa/feature/skeleton
64eb463 
Update best practices
@jaraco
Copy concurrency setting from setuptools
7a04cbd
@jaraco jaraco mentioned this pull request Nov 8, 2023
Merged
2 tasks
@jaraco jaraco force-pushed the feature/distutils-sync branch from 75ea580 to c614ef5 Compare November 8, 2023 14:59
@jaraco
Copy link
Member Author

jaraco commented Nov 12, 2023

I don't understand why the pull request tests are failing but the push tests are fine... because they are both based on main so the diff between pull request and push should be zero.

@jaraco jaraco closed this Nov 12, 2023
@jaraco jaraco reopened this Nov 12, 2023
@abravalheri
Copy link
Contributor

abravalheri commented Nov 16, 2023 •
edited
Loading

I don't understand why the pull request tests are failing but the push tests are fine... because they are both based on main so the diff between pull request and push should be zero.

There are some differences in setuptools/command/build_clib.py, setuptools/dep_util.py and setuptools/tests/test_dep_util.py, so probably even if the same code paths are executed, a simple thing like changing the total number of lines in a file might mess with the coverage percentiles1.

Footnotes

  1. Coverage is very useful, but also can be quite tricky and fragile sometimes... ↩

abravalheri
abravalheri reviewed Nov 16, 2023
View reviewed changes
Copy link
Contributor

@abravalheri abravalheri left a comment

Choose a reason for hiding this comment

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

Maybe the following suggestions would help with the diffcov errors?

setuptools/dep_util.py
n_targets.append(targets[i])

return n_sources, n_targets
def __getattr__(name):
Copy link
Contributor

@abravalheri abravalheri Nov 16, 2023

Choose a reason for hiding this comment

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

Suggested change
def __getattr__(name):
def __getattr__(name): # pragma: no cover

setuptools/command/build_clib.py

try:
from distutils._modified import newer_pairwise_group
except ImportError:
Copy link
Contributor

@abravalheri abravalheri Nov 16, 2023

Choose a reason for hiding this comment

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

Suggested change
except ImportError:
except ImportError: # pragma: no cover

@jaraco
Copy link
Member Author

jaraco commented Nov 18, 2023

Oh! Good news. The tests that were failing before stopped failing after I closed and re-opened the PR. Now all that's failing is the diffcov tests. I'm happy to ignore those failures.

Thanks for the extra set of eyes!

@jaraco jaraco merged commit 520336e into main Nov 18, 2023
@jaraco jaraco deleted the feature/distutils-sync branch November 18, 2023 19:48
@jaraco jaraco mentioned this pull request Mar 3, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@abravalheri abravalheri abravalheri left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

test_bdist_ext tests started failing with pytest 7.2

2 participants

@jaraco @abravalheri