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: update dependencies #218868

Merged
merged 1 commit into from
Mar 7, 2023
Merged

Conversation

dotlambda
Copy link
Member

@dotlambda dotlambda commented Feb 28, 2023

Description of changes

Diff: python-poetry/poetry@refs/tags/1.3.2...1.4.0

Changelog: https://github.com/python-poetry/poetry/blob/refs/tags/1.4.0/CHANGELOG.md

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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.

@dotlambda dotlambda changed the base branch from master to staging-next March 5, 2023 04:20
@dotlambda dotlambda changed the title poetry: 1.3.2 -> 1.4.0 poetry: update dependencies Mar 5, 2023
@dotlambda dotlambda requested a review from mweinelt March 5, 2023 04:21
@dotlambda dotlambda marked this pull request as ready for review March 5, 2023 04:21
@prusnak
Copy link
Member

prusnak commented Mar 7, 2023

Don't we also need to update pkgs/development/python-modules/poetry-core/default.nix to 1.5.1?

Here's my diff:

diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index 82438a69545..e94a68e9dec 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "1.4.0";
+  version = "1.5.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,8 +23,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = pname;
-    rev = version;
-    hash = "sha256-SCzs2v0LIgx3vBYTavPqc7uwAQdWsdmkbDyHgIjOxrk=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-h3d0h+WCrrNlfPOlUx6Rj0aG6untD6MiunqvPj4yT+0=";
   };
 
   propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [

Also where is the actual update of poetry to 1.4.0?

Here's my suggestion:

diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix
index e98c571ddb7..ba7f83b3386 100644
--- a/pkgs/tools/package-management/poetry/unwrapped.nix
+++ b/pkgs/tools/package-management/poetry/unwrapped.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.3.2";
+  version = "1.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "python-poetry";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU=";
+    hash = "sha256-vbG9nsrCvytpKLJbC1EKeyTSjaDlsKvdRCwT6aSq6B4=";
   };
 
   nativeBuildInputs = [

@mweinelt
Copy link
Member

mweinelt commented Mar 7, 2023

Already on 1.5.1 on the target branch, which is staging-next.

@mweinelt mweinelt requested a review from K900 March 7, 2023 21:37
@mweinelt
Copy link
Member

mweinelt commented Mar 7, 2023

Builds on both darwin after rebasing on a more recent staging-next version.

@mweinelt mweinelt merged commit 2db5027 into NixOS:staging-next Mar 7, 2023
@dotlambda dotlambda deleted the poetry-1.4.0 branch March 7, 2023 21:52
@prusnak
Copy link
Member

prusnak commented Mar 7, 2023

Ah, sorry for the noise. My local staging-next branch was not synced although I thought it already was.

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.

None yet

3 participants