Unverified Commit 26febad4 authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

poetry: 2.1.4 -> 2.2.0 (#442939)

parents d30649fb 5bf672a2
Loading
Loading
Loading
Loading
+2 −24
Original line number Diff line number Diff line
@@ -11,18 +11,6 @@ let
    {
      poetry = self.callPackage ./unwrapped.nix { };

      # Poetry 2.1.4 officially requires virtualenv >=20.26.6, <20.33.0
      # otherwise will be incompatible with python312
      # see: https://github.com/python-poetry/poetry/issues/10490
      virtualenv = super.virtualenv.overridePythonAttrs (old: rec {
        version = "20.30.0";
        src = fetchPypi {
          inherit (old) pname;
          inherit version;
          hash = "sha256-gAhjFivKpUUKbk1yEElzDn8trgdyDgkCsOQEC9b5rag=";
        };
      });

      # The versions of Poetry and poetry-core need to match exactly,
      # and poetry-core in nixpkgs requires a staging cycle to be updated,
      # so apply an override here.
@@ -30,22 +18,12 @@ let
      # We keep the override around even when the versions match, as
      # it's likely to become relevant again after the next Poetry update.
      poetry-core = super.poetry-core.overridePythonAttrs (old: rec {
        version = "2.1.3";
        version = "2.2.0";
        src = fetchFromGitHub {
          owner = "python-poetry";
          repo = "poetry-core";
          tag = version;
          hash = "sha256-CgaWlqjvBTN7GuerzmO5IiEdXxYH6pmTDj9IsNJlCBE=";
        };
      });

      findpython = super.findpython.overridePythonAttrs (old: rec {
        version = "0.6.3";

        src = fetchPypi {
          inherit (old) pname;
          inherit version;
          hash = "sha256-WGPqVVVtiq3Gk0gaFKxPNiSVJxnvwcVZGrsLSp6WXJQ=";
          hash = "sha256-WLPG8BiM+927qSC+ly5H2IAE2Htm8+wLEjK2AFnMJ58=";
        };
      });
    }
+6 −19
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
  fetchpatch,
  poetry,
  poetry-core,
  pytest-mock,
@@ -12,28 +11,16 @@

buildPythonPackage rec {
  pname = "poetry-plugin-export";
  version = "1.9.0";
  format = "pyproject";
  version = "1.9.0-unstable-2025-09-14";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "python-poetry";
    repo = "poetry-plugin-export";
    tag = version;
    hash = "sha256-AP3/njzbLEi2s4pOUSLLLzqNprvxwLe9LSY7qh08EWc=";
    rev = "70a2f386a52687adee7353b51e59dd45aa319ee7";
    hash = "sha256-KsvkM4hjG+jrdPVauXYdc6E87Gp7srMg/mJHpWRjaEs=";
  };

  patches = [
    # Remove after next release of poetry-plugin-export
    (fetchpatch {
      url = "https://github.com/python-poetry/poetry-plugin-export/commit/16637f194e86708913ec6e09064c713eb0715bb6.patch";
      includes = [
        "tests/test_exporter.py"
        "tests/markers.py"
      ];
      hash = "sha256-ncz9kqp18+yeRXlhmLEcWfO1bDavjohhmVw6DwTy1hA=";
    })
  ];

  build-system = [
    poetry-core
  ];
@@ -48,10 +35,10 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

  meta = with lib; {
  meta = {
    changelog = "https://github.com/python-poetry/poetry-plugin-export/blob/${src.rev}/CHANGELOG.md";
    description = "Poetry plugin to export the dependencies to various formats";
    license = licenses.mit;
    license = lib.licenses.mit;
    homepage = "https://github.com/python-poetry/poetry-plugin-export";
    maintainers = [ ];
  };
+7 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@
  pytestCheckHook,
  pytest-mock,
  poetry,
  writableTmpDirAsHomeHook,
}:

buildPythonPackage rec {
@@ -31,11 +32,14 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    pytestCheckHook
    pytest-mock
    writableTmpDirAsHomeHook
  ];

  preCheck = ''
    export HOME=$TMPDIR
  '';
  disabledTests = [
    # https://github.com/MousaZeidBaker/poetry-plugin-up/issues/78
    "test_command_preserve_wildcard_project"
    "test_command_with_latest_project"
  ];

  meta = {
    description = "Poetry plugin to simplify package updates";
+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@

buildPythonPackage rec {
  pname = "poetry";
  version = "2.1.4";
  version = "2.2.0";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -46,7 +46,7 @@ buildPythonPackage rec {
    owner = "python-poetry";
    repo = "poetry";
    tag = version;
    hash = "sha256-6QYg+QRZ60hgcAvKiUqC3gW7P0oK0vaFps9NYIPhBb8=";
    hash = "sha256-CI3+0P+eIFpdnyxy1zhaEMWAsX/R0qqdAvVEQ5fqnhk=";
  };

  build-system = [