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

Jump to bottom

[20.09] zope_filerepresentation: fix test #100455

Merged
merged 1 commit into from Oct 14, 2020
Merged

[20.09] zope_filerepresentation: fix test #100455

merged 1 commit into from Oct 14, 2020

Conversation

jfroche
Copy link
Contributor

@jfroche jfroche commented Oct 14, 2020 •
edited

Motivation for this change

Fix test

backport of #100454

ZHF: #97479
@NixOS/nixos-release-managers

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.

@ofborg ofborg bot requested a review from cillianderoiste October 14, 2020 00:13
@jonringer
Copy link
Contributor

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

jonringer
jonringer requested changes Oct 14, 2020
View reviewed changes
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.

above

@jfroche
zope_filerepresentation: fix test
fa55566 
(cherry picked from commit 74d8752)
@jfroche jfroche force-pushed the backport-fix/zope_filerepresentation-test branch from cb7e484 to fa55566 Compare October 14, 2020 00:21
@jfroche
Copy link
Contributor Author

jfroche commented Oct 14, 2020

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build

Right sorry about that. It is fixed

jonringer
jonringer approved these changes Oct 14, 2020
View reviewed changes
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.

LGTM

Result of nixpkgs-review pr 100455 1

3 packages built:
  • python27Packages.zope_filerepresentation
  • python37Packages.zope_filerepresentation
  • python38Packages.zope_filerepresentation

@jonringer jonringer merged commit 07e16bc into NixOS:release-20.09 Oct 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jfroche @jonringer