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

pythonPackages.pelican: Add patch from upstream for failing tests with… #87600

Closed
wants to merge 1 commit into from
Closed

pythonPackages.pelican: Add patch from upstream for failing tests with… #87600

wants to merge 1 commit into from

Conversation

dashmoho
Copy link

… updated pygments version

Motivation for this change

This fixes issue with failing tests (#83513).

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 review from offlinehacker and prikhi May 11, 2020 13:15
@Moredread
Copy link
Contributor

A slight improvement would be to get the patch via fetchpatch like in

nixpkgs/pkgs/applications/office/scribus/unstable.nix

Line 46 in df81d9a

patches = [

But already a big thanks for tracking this down. ;)

@dashmoho
Copy link
Author

Patch also contains fixes for some other files, e.g. in custom_locale, which we are removing from tarball. But I'll use it for future, thanks!

Moredread
Moredread reviewed May 18, 2020
View reviewed changes
Copy link
Contributor

@Moredread Moredread left a comment •
edited

Choose a reason for hiding this comment

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

Commit message has a spelling mistake 'pythonPackaes.pelican' instead of 'pythonPackages.pelican'. Besides that everything looks good. :) Tested with nix-review.

@Moredread Moredread mentioned this pull request Jul 27, 2020
Closed
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/235

@jonringer
Copy link
Contributor

Patch also contains fixes for some other files, e.g. in custom_locale, which we are removing from tarball. But I'll use it for future, thanks!

you can also pass includes and excludes to fetchpatch to prune the files you don't care about.

Mic92
Mic92 reviewed Jul 31, 2020
View reviewed changes
pkgs/development/python-modules/pelican/default.nix
@@ -48,6 +48,11 @@ buildPythonPackage rec {
nose
];

patches = [
# fix for updated pygments version. Remove when updating to new version.
./pygments-tests.patch
Copy link
Member

Choose a reason for hiding this comment

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

Is this taken from a pull request? If so it would be nice to use fetchpatch on the commit url instead of adding the patch to nixpkgs.

Copy link
Member

Choose a reason for hiding this comment

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

Just saw the other comments above.

@Moredread
Copy link
Contributor

A new pelican version has been released recently, but for nixos-20.03 this PR is still relevant.

@dashmoho would it be ok if I created a backport PR for your patches?

@jonringer
Copy link
Contributor

A new pelican version has been released recently, but for nixos-20.03 this PR is still relevant.

@dashmoho would it be ok if I created a backport PR for your patches?

as long as the new version doesn't introduce any regressions. It's fine to backport package updates (generally patch and minor versions, if the package follows semver)

@Moredread
Copy link
Contributor

A new pelican version has been released recently, but for nixos-20.03 this PR is still relevant.
@dashmoho would it be ok if I created a backport PR for your patches?

as long as the new version doesn't introduce any regressions. It's fine to backport package updates (generally patch and minor versions, if the package follows semver)

How do we handle this if upstream has regressions but the package was broken for the whole the release was current?

In this case the latest Pelican releases drops support for Python 2.7, but never worked for nixos-20.03.

Should we still backport the patch or upgrade to the latest Pelican release?

@Moredread Moredread mentioned this pull request Aug 24, 2020
Merged
10 tasks
@jonringer
Copy link
Contributor

In this case the latest Pelican releases drops support for Python 2.7, but never worked for nixos-20.03.

Should we still backport the patch or upgrade to the latest Pelican release?

I would say just make the changes to master, if someone opens an issue that backporting the change would be worthwhile, then we can look into it.

@SuperSandro2000
Copy link
Member

Patch does not cleanly apply anymore when doing nixpkgs-review.

@thiagokokada
Copy link
Contributor

Result of nixpkgs-review pr 87600 1

2 packages failed to build:
  • python37Packages.pelican
  • python38Packages.pelican

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 87600 run on x86_64-darwin 1

2 packages failed to build:
  • python37Packages.pelican
  • python38Packages.pelican
  patching file pelican/tests/output/custom/feeds/misc.atom.xml
  Reversed (or previously applied) patch detected!  Assume -R? [n]
  Apply anyway? [n]
  Skipping patch.
  1 out of 1 hunk ignored -- saving rejects to file pelican/tests/output/custom/feeds/misc.atom.xml.rej
  patching file pelican/tests/output/custom/unbelievable.html
  Reversed (or previously applied) patch detected!  Assume -R? [n]
  Apply anyway? [n]
  Skipping patch.
  1 out of 1 hunk ignored -- saving rejects to file pelican/tests/output/custom/unbelievable.html.rej

@dotlambda
Copy link
Member

superseded by #112137

@dotlambda dotlambda closed this Feb 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@Moredread Moredread Moredread left review comments

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

@prikhi prikhi Awaiting requested review from prikhi

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

Successfully merging this pull request may close these issues.

None yet
9 participants
@dashmoho @Moredread @nixos-discourse @jonringer @SuperSandro2000 @thiagokokada @dotlambda @Mic92 @Janik-Haag