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

fix #10447 - consider marks in reverse mro order to give base classes priority #11155

Conversation

RonnyPfannschmidt
Copy link
Member

No description provided.

@RonnyPfannschmidt RonnyPfannschmidt force-pushed the fix-10447-maker-mro-order-needs-reverse branch from d909411 to c207f7c Compare July 1, 2023 20:15
@RonnyPfannschmidt RonnyPfannschmidt force-pushed the fix-10447-maker-mro-order-needs-reverse branch from c207f7c to 561f1a9 Compare July 1, 2023 20:27
@RonnyPfannschmidt RonnyPfannschmidt added needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch backport 7.3.x labels Jul 1, 2023
jaraco added a commit to pypa/distutils that referenced this pull request Jul 1, 2023
@jaraco
Copy link
Contributor

jaraco commented Jul 1, 2023

I've confirmed that this change also addresses the test failures originally encountered in pypa/distutils#186.

@RonnyPfannschmidt RonnyPfannschmidt merged commit f9410fd into pytest-dev:main Jul 2, 2023
@suewonjp
Copy link

@RonnyPfannschmidt
Thank you for the work from pytest team.

This fix was merged a long time ago, but has not been included in any of the latest releases.
Can you let us know when we can have the fix?

Thank you.

@nicoddemus
Copy link
Member

nicoddemus commented Oct 21, 2023

Hi @suewonjp,

While this is a bug fix and it seems it was attempted to backport for 7.3.x, due to its label:

image

but it seems it never was ported in the end (not sure why).

This will be released on pytest 7.5 or more likely 8.0 (#11126), but we don't have a timeline for that yet.

@nicoddemus
Copy link
Member

@RonnyPfannschmidt do you recall why this was not backported in the end? Just for recording purposes.

@RonnyPfannschmidt
Copy link
Member Author

@nicoddemus i believe i missed the failure of the back-porting process

@nicoddemus
Copy link
Member

Oh in that case let's try to backport again, then it might go out in the next 7.4.x release.

@nicoddemus nicoddemus added backport 7.4.x and removed needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch labels Oct 24, 2023
@nicoddemus
Copy link
Member

#11545 🎉

@nicoddemus
Copy link
Member

7.4.3 released which includes this fix. 👍

@jaraco jaraco mentioned this pull request Nov 8, 2023
2 tasks
clrpackages pushed a commit to clearlinux-pkgs/pypi-setuptools that referenced this pull request Nov 28, 2023
…version 69.0.2

Anderson Bravalheri (50):
      Temporarily disable overdue deprecations
      Remove sphinx-hoverxref
      Unify passenv with pass_env in tox.ini so we don't have trouble with TOX_OVERRIDE
      Docs: use Python 3.11 inventory to avoid errors with distutils references
      Refactor type files tests in test_build_py
      Avoid running build_py in tests to speed up process
      Mark feature as experimental in docs
      Avoid modifying dict in test_build_py
      Apply suggestions from code review
      Fix failing CI (#4110)
      Re-enable deprecation warning enforcement
      Remove deprecation warning from _normalization.best_effort_version
      Remove egg_base option from dist_info
      Ensure tags generated by egg_info are valid
      Remove 'requires' and 'license_file' from setup.cfg
      Improve explanation of difference between safe_version and best_effort_version
      Remove deprecation warning for config_settings --global-option
      Remove deprecation warning for invalid versions in setuptools.dist
      Add news fragments
      Xfail on deprecated bdist_rpm tests
      Be strict on missing 'dynamic' in pyproject.toml
      Enforce namespace-packages are not used in pyproject.toml
      Use custom class for InvalidConfigError
      Add newsfragments for latest removals
      Update newsfragments
      Fix lint errors
      Add workaround for unreleased PyNaCl
      Only pass `--build-option` to `bdist_wheel` in build_meta
      Remove no longer valid tests for config_settings and editable installs
      Add news fragment
      Update guides on datafiles
      Add note abot using namespace packages for data files
      Add note about dynamic configs via attr and imports
      Use InvalidConfigError instead of ValueError in build_meta
      Remove deprecated handling of build-option passed as global-option
      Relax validation of --global-option in build_meta
      Add newsfragment
      Mark flaky test on  with xfail
      Add pragma for xfail condition
      Add reference to PR number in xfail message
      Fix lint error
      Add missing contextmanager to decorator
      Use wrapper for decorator instead of contextlib
      Bump version: 68.2.2 → 69.0.0
      Allow imports of setuptools.dep_util.newer_group with deprecation warning
      Add newsfragment
      Bump version: 69.0.0 → 69.0.1
      Improve warning visibility with due date and reference url
      Add news fragment
      Bump version: 69.0.1 → 69.0.2

Avasam (4):
      Re-export `distutils.dep_util` in `setuptools.dep_util`
      Added towncrier file
      Added towncrier file
      Update newsfragments/4069.feature.rst

Danie-1 (1):
      Use generators

Daniel Naylor (11):
      Include type information by default
      Add newsfragment
      Revert "Use generators"
      Revert "Include type information by default"
      Rename newsfragment file
      Add tests to check type information is included by default
      Format test with black
      Include type information by default
      Move tests from test_build_meta to test_build_py
      Fix test on windows by replacing os.sep
      Fix typo in docs

Daniel Nunes (1):
      Added tests for newer_pairwise_group().

Dimitri Papadopoulos (8):
      Fix typo found by codespell
      Fix a couple typos found by codespell
      Update URLs in documentation: http:// → https://
      io.open() → open()
      IOError → OSError
      "yield from", instead of "yield" in a loop
      socket.error → OSError
      @functools.lru_cache() → @functools.lru_cache

Jason R. Coombs (36):
      Rely on pytest as found in pytest-dev/pytest#11155. Fixes pypa/distutils#186.
      Pin against sphinx 7.2.5 as workaround for sphinx/sphinx-doc#11662. Closes jaraco/skeleton#88.
      Allow GITHUB_* settings to pass through to tests.
      Remove spinner disablement. If it's not already fixed upstream, that's where it should be fixed.
      Clean up 'color' environment variables.
      Add diff-cover check to Github Actions CI. Closes jaraco/skeleton#90.
      Add descriptions to the tox environments. Closes jaraco/skeleton#91.
      Add FORCE_COLOR to the TOX_OVERRIDE for GHA. Requires tox 4.11.1. Closes jaraco/skeleton#89.
      Prefer ``pass_env`` in tox config. Preferred failure mode for tox-dev/tox#3127 and closes jaraco/skeleton#92.
      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).
      Modernize test_newer_pairwise_group by using tmp_path and a SimpleNamespace.
      Remove latent references in docs.
      Limit sphinxlint jobs to 1. Workaround for sphinx-contrib/sphinx-lint#83.
      Replace git version with released version. Ref #186.
      Disable cygwin tests for now. Ref pypa/setuptools#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.
      Use 'setuptools.modified' as the consolidated module for modified file functions.
      Fallback when SETUPTOOLS_USE_DISTUTILS=stdlib
      Make the example pyproject.toml valid toml so it doesn't crash docs builds. Closes #4118.
      Exclude setuptools.modified from test collection to avoid early import.

Jean Abou Samra (5):
      Import PUG guide to MANIFEST.in
      Add the more complete list
      Revise list of default included files
      Add warning about other setuptools versions
      Link to the new pyproject.toml guide the PUG

Miro Hrončok (1):
      Fix setuptools.depends:get_module_constant() on Python 3.13.0a1
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