Skip to content

poetry: fix up dependencies #280522

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.

Sign up for GitHub

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

Merged
dotlambda merged 1 commit into from
Jan 13, 2024
Merged

poetry: fix up dependencies #280522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/tools/package-management/poetry/unwrapped.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
, cleo
, crashtest
, dulwich
, fastjsonschema
, installer
, jsonschema
, keyring
, packaging
, pexpect
Expand Down Expand Up @@ -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

@dotlambda dotlambda Jan 12, 2024

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

@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.

Because there is nothing meaningful to fetch.

Copy link
Member

@dotlambda dotlambda Jan 12, 2024

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 •
edited
Loading

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

@dotlambda dotlambda 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?

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

@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.

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.

"platformdirs"
];

propagatedBuildInputs = [
Expand All @@ -69,8 +69,8 @@ buildPythonPackage rec {
cleo
crashtest
dulwich
fastjsonschema
installer
jsonschema
keyring
packaging
pexpect
Expand Down