From 29e4bae0c12cf6df72bfd091d9fae5de5f29f2b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Feb 2024 23:23:24 +0100 Subject: [PATCH 1/3] python311Packages.pydantic_1: 1.10.13 -> 1.10.14 https://github.com/pydantic/pydantic/blob/v1.10.14/HISTORY.md --- pkgs/development/python-modules/pydantic/1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index e1fc840f0ee1..ea19a279bb2a 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.13"; + version = "1.10.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-ruDVcCLPVuwIkHOjYVuKOoP3hHHr7ItIY55Y6hUgR74="; + hash = "sha256-tcaHSPZggVwyzCgDmwOgcGqUmUrJOmkdSNudJTFQ3bc="; }; nativeBuildInputs = [ From 98c9af1ac305130726fe3c5f76f2c62ba9c9cb0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Feb 2024 23:33:30 +0100 Subject: [PATCH 2/3] python312Packages.pydantic_1: disable failing tests --- pkgs/development/python-modules/pydantic/1.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index ea19a279bb2a..42ce2745d727 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -6,6 +6,7 @@ , pytest-mock , pytestCheckHook , python-dotenv +, pythonAtLeast , pythonOlder , setuptools , typing-extensions @@ -62,6 +63,15 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # depends on distuils + "test_cython_function_untouched" + # AssertionError on exact types and wording + "test_model_subclassing_abstract_base_classes_without_implementation_raises_exception" + "test_partial_specification_name" + "test_secretfield" + ]; + enableParallelBuilding = true; pythonImportsCheck = [ "pydantic" ]; From f72a84d98d82366aa8c2f24a0f353bc77cd0bfb5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Feb 2024 18:46:01 +0100 Subject: [PATCH 3/3] prowler: relax pydantic constraint Pinned to 1.10.13, we want 1.10.14 now. --- pkgs/by-name/pr/prowler/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 466732634cd6..702d78b78a79 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { "botocore" "google-api-python-client" "slack-sdk" + "pydantic" ]; nativeBuildInputs = with python3.pkgs; [