Skip to content

Comments

python3Packages.pep257: rename to pydocstyle, python3Packages.pytest-pep257: abandoned by upstream#162222

Closed
fabaff wants to merge 2 commits intoNixOS:stagingfrom
fabaff:fix-pytest-pep257
Closed

python3Packages.pep257: rename to pydocstyle, python3Packages.pytest-pep257: abandoned by upstream#162222
fabaff wants to merge 2 commits intoNixOS:stagingfrom
fabaff:fix-pytest-pep257

Conversation

@fabaff
Copy link
Member

@fabaff fabaff commented Feb 28, 2022

Motivation for this change

Fix build (https://hydra.nixos.org/build/167083624)

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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Feb 28, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Feb 28, 2022
jonringer
jonringer reviewed Feb 28, 2022
View reviewed changes
@fabaff fabaff force-pushed the fix-pytest-pep257 branch from 7a50a78 to cccef53 Compare March 28, 2022 09:33
@fabaff

This comment was marked as outdated.

Sign in to view
SuperSandro2000
SuperSandro2000 reviewed Mar 28, 2022
View reviewed changes
@fabaff fabaff force-pushed the fix-pytest-pep257 branch 2 times, most recently from a2ac5b9 to 4dd0cb0 Compare March 28, 2022 12:50
@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Mar 28, 2022
SuperSandro2000
SuperSandro2000 reviewed Mar 28, 2022
View reviewed changes
SuperSandro2000
SuperSandro2000 requested changes Mar 28, 2022
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Also we must target staging now.

@fabaff fabaff force-pushed the fix-pytest-pep257 branch from 4dd0cb0 to 0ce602d Compare March 28, 2022 18:24
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: package (new) This PR adds a new package 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Mar 28, 2022
@arianvp
Copy link
Member

arianvp commented Mar 28, 2022

The comment was I think pointed at you notifying basically all Nixpkgs maintainers for review on this PR which generates a lot of noise

@fabaff
Copy link
Member Author

fabaff commented Mar 28, 2022

The comment was I think pointed at you notifying basically all Nixpkgs maintainers for review on this PR which generates a lot of noise

Oh, now I get it.

We no longer have the Github action (/rebase staging) which took care of changing the base branch in a silent way. I think that the git rebase --onto-approach would avoid the notification but for me this failed one too many times. Guess it's time to use that again.

@fabaff fabaff force-pushed the fix-pytest-pep257 branch from 0ce602d to 9d24386 Compare March 29, 2022 06:29
@Mic92
Copy link
Member

Mic92 commented Mar 29, 2022

I also don't know how to rebase correctly without generating notifications. And no one has provided me working instructions for this.

@FRidh
Copy link
Member

FRidh commented Mar 29, 2022

As far as I recall it's, when going from master to staging

git rebase --onto upstream/staging upstream/master
git push -f origin HEAD:your_branch

and then change in the github ui the target branch from master to staging.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Mar 29, 2022 •
edited
Loading

I always do the following which seems to work:

Replace X with the number of commits.

git fetch --all
git rebase --onto=$(git merge-base upstream/staging upstream/staging-next) HEAD~X
git push -f

@ofborg eval

@fabaff fabaff mentioned this pull request Apr 28, 2022
Merged
13 tasks
@fabaff fabaff force-pushed the fix-pytest-pep257 branch 2 times, most recently from 46d6993 to 6929f03 Compare April 28, 2022 22:43
@fabaff fabaff force-pushed the fix-pytest-pep257 branch from 6929f03 to 285b1e3 Compare June 7, 2022 22:24
@fabaff
Copy link
Member Author

fabaff commented Jun 7, 2022

Was part of #166489

@fabaff fabaff closed this Jun 7, 2022
@fabaff fabaff deleted the fix-pytest-pep257 branch December 18, 2024 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@FRidh FRidh Awaiting requested review from FRidh

+1 more reviewer

@jonringer jonringer jonringer left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@fabaff @dasJ @arianvp @Mic92 @FRidh @SuperSandro2000 @jonringer