Skip to content

Python 3.12.4 regression fixes #320020

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
mweinelt merged 4 commits into from
Jun 15, 2024
Merged

Python 3.12.4 regression fixes #320020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bcc42f
python312Packages.furl: disable failing test
mweinelt Jun 15, 2024
f373141
python312Packages.sphinx: disable failing test
mweinelt Jun 15, 2024
5660634
python312Packages.pydantic-core: 2.16.3 -> 2.18.4
mweinelt Jun 15, 2024
de8015c
python312Packages.pydantic: 2.6.3 -> 2.7.4
mweinelt Jun 15, 2024
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
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/furl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchPypi,
pythonAtLeast,
flake8,
orderedmultidict,
pytestCheckHook,
Expand Down Expand Up @@ -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; {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/python-modules/pydantic-core/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
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 ];

cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-wj9u6s/3E3EWfQydkLrwHbJBvm8DwcGCoQQpSw1+q7U=";
hash = "sha256-m0xP4fIFgInkUeAy4HqfTKHEiqmWpYO8CgKzxg+WXiU=";
};

nativeBuildInputs = [
Expand Down
21 changes: 6 additions & 15 deletions pkgs/development/python-modules/pydantic/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

buildPythonPackage rec {
pname = "pydantic";
version = "2.6.3";
version = "2.7.4";
pyproject = true;

disabled = pythonOlder "3.8";
Expand All @@ -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 = [
Expand Down Expand Up @@ -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 = [
Expand Down
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/sphinx/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
pythonAtLeast,
pythonOlder,
fetchFromGitHub,
isPyPy,
Expand Down Expand Up @@ -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
Expand Down