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

poetry: fix up dependencies #280522

Merged
merged 1 commit into from
Jan 13, 2024
Merged

poetry: fix up dependencies #280522

merged 1 commit into from
Jan 13, 2024

Conversation

mweinelt
Copy link
Member

Checking runtime dependencies for poetry-1.7.1-py3-none-any.whl

  • fastjsonschema not installed
  • platformdirs<4.0.0,>=3.0.0 not satisfied by version 4.0.0

Description of changes

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.

@mweinelt mweinelt requested a review from dotlambda January 12, 2024 15:07
@@ -59,8 +59,8 @@ buildPythonPackage rec {
];

pythonRelaxDeps = [
# only pinned to avoid dependency on Rust
"jsonschema"
# platformdirs 4.x is backwards compatible; https://github.com/python-poetry/poetry/commit/eb80d10846f7336b0b2a66ce2964e72dffee9a1c
Copy link
Member

Choose a reason for hiding this comment

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

Why not use fetchpatch?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because there is nothing meaningful to fetch.

Copy link
Member

Choose a reason for hiding this comment

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

i.e. that commit doesn't apply cleanly?

Copy link
Member Author

@mweinelt mweinelt Jan 12, 2024

Choose a reason for hiding this comment

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

To clarify, you want me to fetch a patch, so that it fails to apply on the next bump, so we remember to remove it again?

Copy link
Member

Choose a reason for hiding this comment

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

To clarify, you want me to fetch a patch, so that it fails to apply on the next bump, so we remember to remove it again?

We don't update poetry in the batch upgrades, so we won't forget to remove the patch.
Anyway, if you prefer pythonRelaxDeps that's fine with me though I can't guarantee I won't forget to remove it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Poetry can break in python-updates, because it is a leaf-package, and we don't pay much attention to those. I have a slight preference for not pulling another FOD for this minor issue, since the hook has that exact use case.

> Checking runtime dependencies for poetry-1.7.1-py3-none-any.whl
>   - fastjsonschema not installed
>   - platformdirs<4.0.0,>=3.0.0 not satisfied by version 4.0.0
@dotlambda dotlambda merged commit 48eaf25 into NixOS:master Jan 13, 2024
22 checks passed
@mweinelt mweinelt deleted the poetry-deps branch January 13, 2024 23:18
@l0b0 l0b0 mentioned this pull request Jan 14, 2024
ches added a commit to ches/nixpkgs that referenced this pull request Jan 15, 2024
Following from NixOS#280522, the xattr dependency still failed the
pythonRuntimeDepsCheck hook, likely overlooked because it is a
Darwin-only dep:

    > Checking runtime dependencies for poetry-1.7.1-py3-none-any.whl
    >   - xattr<0.11.0,>=0.10.0 not satisfied by version 1.0.0

From 0.10.0 to 1.0.0 there are no functional changes with compatibility
implications, only dropped support for Python 2.
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.

2 participants