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

pyp: 1.1.0 -> 1.2.0 #292693

Merged
merged 4 commits into from
Mar 12, 2024
Merged

pyp: 1.1.0 -> 1.2.0 #292693

merged 4 commits into from
Mar 12, 2024

Conversation

AndersonTorres
Copy link
Member

@AndersonTorres AndersonTorres commented Mar 2, 2024

  • Merge and refactor the two packages
    • pyp and python3Packages.pyp should be the same file!
  • set bc and jq appropriately
  • get rid of rec
  • get rid of nested with
  • set pyproject
  • set meta.mainProgram

Description of changes

Closes #286964 and #294107 until better idea

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@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/3598

@AndersonTorres AndersonTorres changed the title pyp: refactor pyp: 1.1.0 -> 1.2.0 Mar 8, 2024
Copy link
Member

@natsukium natsukium left a comment

Choose a reason for hiding this comment

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

The upstream's diff looks fine to me.
hauntsaninja/pyp@v1.1.0...v1.2.0

pkgs/development/python-modules/pyp/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyp/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/pyp/default.nix Outdated Show resolved Hide resolved
@SuperSandro2000
Copy link
Member

  • python3Packages.pyp

Do we even need that? Is this a library you can import? I couldn't find something in the readme.

- Merge and refactor the two packages
  - pyp and python3Packages.pyp should be the same file!
- set bc and jq appropriately
- get rid of rec
- get rid of nested with
- set pyproject
- set meta.mainProgram
Since it is not used as library, it makes no sense to deploy it as a library.
@AndersonTorres
Copy link
Member Author

  • python3Packages.pyp

Do we even need that? Is this a library you can import? I couldn't find something in the readme.

It is a long history... But indeed you are correct.

Copy link
Member

@natsukium natsukium left a comment

Choose a reason for hiding this comment

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

LGTM

@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-already-reviewed/2617/1515

@fabianhjr fabianhjr merged commit ea2e6eb into NixOS:master Mar 12, 2024
27 checks passed
@vcunat
Copy link
Member

vcunat commented Mar 13, 2024

Same for 23.11? It also doesn't build there now, looked like the same cause:
https://hydra.nixos.org/job/nixos/release-23.11/nixpkgs.pyp.x86_64-linux

@AndersonTorres
Copy link
Member Author

AndersonTorres commented Mar 13, 2024

Do you suggest a backport? Lemme see what the bot says...

Copy link
Contributor

Backport failed for release-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.11
git worktree add -d .worktree/backport-292693-to-release-23.11 origin/release-23.11
cd .worktree/backport-292693-to-release-23.11
git switch --create backport-292693-to-release-23.11
git cherry-pick -x 9f3840785bed83234dd27b293ad30b38e4aece29 5211205ca9a44c3eff29c940d4238bd87aa733fc d6599f77f65c65cfb4dac3dd8eec52f21bd4e6ce cd975261c7594517908b1c39d39a9197baf3b28d

@AndersonTorres AndersonTorres mentioned this pull request Mar 21, 2024
13 tasks
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.

Build failure: pyp and python311Packages.pyp
7 participants