Skip to content

python310Packages.pluggy: 1.0.0 -> 1.2.0#240480

Merged
dotlambda merged 2 commits intoNixOS:stagingfrom
dotlambda:pluggy-1.2.0
Jul 14, 2023
Merged

python310Packages.pluggy: 1.0.0 -> 1.2.0#240480
dotlambda merged 2 commits intoNixOS:stagingfrom
dotlambda:pluggy-1.2.0

Conversation

@dotlambda
Copy link
Copy Markdown
Member

@dotlambda dotlambda commented Jun 29, 2023

Description of changes

Diff: pytest-dev/pluggy@refs/tags/1.0.0...1.2.0

Changelog: https://github.com/pytest-dev/pluggy/blob/refs/tags/1.2.0/CHANGELOG.rst

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@dotlambda dotlambda requested a review from mweinelt June 29, 2023 06:57
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jun 29, 2023
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jun 29, 2023
@figsoda figsoda added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 1, 2023
@dotlambda dotlambda merged commit 99aa76c into NixOS:staging Jul 14, 2023
@dotlambda dotlambda deleted the pluggy-1.2.0 branch July 14, 2023 08:04
@trofi
Copy link
Copy Markdown
Contributor

trofi commented Jul 15, 2023

Bisect says c243137 python310Packages.pluggy: 1.0.0 -> 1.2.0 broke python310Packages.virtualenv build on staging:

$ nix build --no-link -f. python310Packages.virtualenv -L
...
python3.10-virtualenv> Executing pytestCheckPhase
python3.10-virtualenv> INTERNALERROR> Traceback (most recent call last):
python3.10-virtualenv> INTERNALERROR>   File "/nix/store/d25c59i7i4fzwzrignmg8c6y2r53zzj7-python3.10-pytest-7.2.1/lib/python3.10/site-packages/_pytest/main.py", line 266, in wrap_session
python3.10-virtualenv> INTERNALERROR>     config._do_configure()
python3.10-virtualenv> INTERNALERROR>   File "/nix/store/d25c59i7i4fzwzrignmg8c6y2r53zzj7-python3.10-pytest-7.2.1/lib/python3.10/site-packages/_pytest/config/__init__.py", line 1037, in _do_configure
python3.10-virtualenv> INTERNALERROR>     self.hook.pytest_configure.call_historic(kwargs=dict(config=self))
python3.10-virtualenv> INTERNALERROR>   File "/nix/store/nd2wrig3f99r8nqawl9n65mhy8xflqw2-python3.10-pluggy-1.2.0/lib/python3.10/site-packages/pluggy/_hooks.py", line 452, in call_historic
python3.10-virtualenv> INTERNALERROR>     res = self._hookexec(self.name, self._hookimpls, kwargs, False)
python3.10-virtualenv> INTERNALERROR>   File "/nix/store/nd2wrig3f99r8nqawl9n65mhy8xflqw2-python3.10-pluggy-1.2.0/lib/python3.10/site-packages/pluggy/_manager.py", line 112, in _hookexec
python3.10-virtualenv> INTERNALERROR>     return self._inner_hookexec(hook_name, methods, kwargs, firstresult)
python3.10-virtualenv> INTERNALERROR>   File "/nix/store/nd2wrig3f99r8nqawl9n65mhy8xflqw2-python3.10-pluggy-1.2.0/lib/python3.10/site-packages/pluggy/_callers.py", line 116, in _multicall
python3.10-virtualenv> INTERNALERROR>     raise exception.with_traceback(exception.__traceback__)
python3.10-virtualenv> INTERNALERROR>   File "/nix/store/nd2wrig3f99r8nqawl9n65mhy8xflqw2-python3.10-pluggy-1.2.0/lib/python3.10/site-packages/pluggy/_callers.py", line 80, in _multicall
python3.10-virtualenv> INTERNALERROR>     res = hook_impl.function(*args)
python3.10-virtualenv> INTERNALERROR>   File "/build/virtualenv-20.19.0/tests/conftest.py", line 26, in pytest_configure
python3.10-virtualenv> INTERNALERROR>     order = manager.hook.pytest_collection_modifyitems._nonwrappers
python3.10-virtualenv> INTERNALERROR> AttributeError: '_HookCaller' object has no attribute '_nonwrappers'

@vcunat vcunat mentioned this pull request Jul 17, 2023
Merged
12 tasks
vcunat added a commit that referenced this pull request Jul 17, 2023
@vcunat
Revert Merge #240480: python310Packages.pluggy: 1.0.0 -> 1.2.0
1733d80 
This reverts commit 99aa76c, reversing
changes made to c4a0fc3.

Broke python3Packages.virtualenv; it would become a channel blocker:
https://hydra.nixos.org/build/228038998/nixlog/307/tail
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Jul 17, 2023

Reverted for now.

@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Jul 17, 2023

Could be pypa/virtualenv#2592

@dotlambda
Copy link
Copy Markdown
Member Author

dotlambda commented Jul 18, 2023

An update to virtualenv 20.24.0 fixes this: #244115

@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Jul 18, 2023

which will be included in the python-updates run #244135

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@mweinelt mweinelt Awaiting requested review from mweinelt

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

Python batch upgrade
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dotlambda @trofi @vcunat @SuperSandro2000 @figsoda