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

python.nbxmpp: 0.6.10 → 1.0.2; gajim: 1.1.3 → 1.2.2 #95785

Merged
merged 1 commit into from Aug 20, 2020

Conversation

vbgl
Copy link
Contributor

@vbgl vbgl commented Aug 19, 2020

Motivation for this change

Major release.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@vbgl
Copy link
Contributor Author

vbgl commented Aug 19, 2020

@GrahamcOfBorg build python37Packages.nbxmpp gajim

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

otherwise diff LGTM, but i don't feel super strongly about it.

https://github.com/NixOS/nixpkgs/pull/95785
3 packages built:
gajim python37Packages.nbxmpp python38Packages.nbxmpp

@jonringer
Copy link
Contributor

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the fix-up commits.

This can be done with:

git reset HEAD~1                    # move fix-up commits into unstaged
git add -- pkgs/                    # move changes into staged
git commit --amend --no-edit        # add changes to previous commit
git push ... ... --force            # modify current PR branch

@vbgl
Copy link
Contributor Author

vbgl commented Aug 20, 2020

Squashed using git rebase -i. This can also be achieved when choosing “squash and merge” on the web interface.

@jonringer
Copy link
Contributor

in this case, yes, I could squash all of them to one commit. But, there's a CONTRIBUTING.md item in the template to ensure that the process is easier on those who are reviewing

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

diff LGTM
shows usage

https://github.com/NixOS/nixpkgs/pull/95785
3 packages built:
gajim python37Packages.nbxmpp python38Packages.nbxmpp

@jonringer jonringer merged commit f04daaa into NixOS:master Aug 20, 2020
@vbgl vbgl deleted the gajim-1.2.2 branch August 21, 2020 06:54
@vbgl
Copy link
Contributor Author

vbgl commented Aug 21, 2020

Thanks for reviewing & merging.

The contributing guide does not tell what to do when the reviewer suggests changes through the web interface: is it ok to just push the button “apply suggestion” (in which case it produces a new commit that does not comply with the contributing guide)?

IMHO, leaving the suggested changes in a separate commit — during the reviewing time only — makes the life of the reviewer easier: they know that their suggestion have been applied as-is. If I instead squash at once, they have to review all the changes again: this might be better regarding the quality of the review, but slightly more time-consuming.

@jonringer
Copy link
Contributor

generally I do the changes on the branch, then

git add pkgs
git commit --amend --no-edit
git push .. .. --force

@jonringer
Copy link
Contributor

It would be nice if they had a Apply suggestion (amend previous) option, I agree

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

Successfully merging this pull request may close these issues.

None yet

2 participants