From 8bcc42fc59075cdf57533c486d43be119f339aad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Jun 2024 11:56:43 +0200 Subject: [PATCH 1/4] python312Packages.furl: disable failing test --- pkgs/development/python-modules/furl/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix index fb9e9b620663..4b4f81d1a2aa 100644 --- a/pkgs/development/python-modules/furl/default.nix +++ b/pkgs/development/python-modules/furl/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, flake8, orderedmultidict, pytestCheckHook, @@ -35,6 +36,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AssertionError: assert '//////path' == '////path' + "test_odd_urls" + ]; + pythonImportsCheck = [ "furl" ]; meta = with lib; { From f3731419c8cbdb07f07e2eb7535e29fd6fd4b4c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Jun 2024 17:02:11 +0200 Subject: [PATCH 2/4] python312Packages.sphinx: disable failing test --- pkgs/development/python-modules/sphinx/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index e781abafac19..d00f5b191f09 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + pythonAtLeast, pythonOlder, fetchFromGitHub, isPyPy, @@ -116,6 +117,10 @@ buildPythonPackage rec { # Could not fetch remote image: http://localhost:7777/sphinx.png "test_copy_images" ] + ++ lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/sphinx-doc/sphinx/issues/12430 + "test_autodoc_type_aliases" + ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous From 566063411d05a53a8508f7dbf650284dc2d15a2c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 Jun 2024 16:57:21 +0200 Subject: [PATCH 3/4] python312Packages.pydantic-core: 2.16.3 -> 2.18.4 https://github.com/pydantic/pydantic-core/releases/tag/v2.17.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.18.0 https://github.com/pydantic/pydantic-core/releases/tag/v2.18.1 https://github.com/pydantic/pydantic-core/releases/tag/v2.18.2 https://github.com/pydantic/pydantic-core/releases/tag/v2.18.3 https://github.com/pydantic/pydantic-core/releases/tag/v2.18.4 --- pkgs/development/python-modules/pydantic-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index cc9854b46853..b0a84ed3fbdb 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -18,14 +18,14 @@ let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.16.3"; + version = "2.18.4"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; rev = "refs/tags/v${version}"; - hash = "sha256-RXytujvx/23Z24TWpvnHdjJ4/dXqjs5uiavUmukaD9A="; + hash = "sha256-wt6HG2jQU09Zxhxhzb49HvNnxahfSk2xvNApVZkqqbw="; }; patches = [ ./01-remove-benchmark-flags.patch ]; @@ -33,7 +33,7 @@ let cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-wj9u6s/3E3EWfQydkLrwHbJBvm8DwcGCoQQpSw1+q7U="; + hash = "sha256-m0xP4fIFgInkUeAy4HqfTKHEiqmWpYO8CgKzxg+WXiU="; }; nativeBuildInputs = [ From de8015cca2bfdf90c4dec96b5fafb82b694031f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 16 Jun 2024 00:37:20 +0200 Subject: [PATCH 4/4] python312Packages.pydantic: 2.6.3 -> 2.7.4 https://github.com/pydantic/pydantic/releases/tag/v2.6.4 https://github.com/pydantic/pydantic/releases/tag/v2.7.0 https://github.com/pydantic/pydantic/releases/tag/v2.7.1 https://github.com/pydantic/pydantic/releases/tag/v2.7.2 https://github.com/pydantic/pydantic/releases/tag/v2.7.3 https://github.com/pydantic/pydantic/releases/tag/v2.7.4 --- .../python-modules/pydantic/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index e9d181b65789..f47c028ac54c 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "2.6.3"; + version = "2.7.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -38,18 +38,9 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-neTdG/IcXopCmevzFY5/XDlhPHmOb6dhyAnzaobmeG8="; + hash = "sha256-S4FZUnOsKC8J0xyTeXhMmCACCma+VfCSmrE6sYAnpok="; }; - patches = [ - (fetchpatch { - # https://github.com/pydantic/pydantic/pull/8678 - name = "fix-pytest8-compatibility.patch"; - url = "https://github.com/pydantic/pydantic/commit/825a6920e177a3b65836c13c7f37d82b810ce482.patch"; - hash = "sha256-Dap5DtDzHw0jS/QUo5CRI9sLDJ719GRyC4ZNDWEdzus="; - }) - ]; - buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; build-system = [ @@ -81,10 +72,10 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) substituteInPlace pyproject.toml \ - --replace "'--benchmark-columns', 'min,mean,stddev,outliers,rounds,iterations'," "" \ - --replace "'--benchmark-group-by', 'group'," "" \ - --replace "'--benchmark-warmup', 'on'," "" \ - --replace "'--benchmark-disable'," "" + --replace-fail "'--benchmark-columns', 'min,mean,stddev,outliers,rounds,iterations'," "" \ + --replace-fail "'--benchmark-group-by', 'group'," "" \ + --replace-fail "'--benchmark-warmup', 'on'," "" \ + --replace-fail "'--benchmark-disable'," "" ''; pytestFlagsArray = [