From bcc6b4032aa8cbca2c6f63c700b0e23afdb3fbae Mon Sep 17 00:00:00 2001 From: Anna Lee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Wed, 15 Nov 2023 21:11:59 +0000 Subject: [PATCH 1/2] python311Packages.edalize: disable failing pandas 2.1.0 tests pandas 2.1.0 apply(...,errors="ignore") behavior changed. upstream pins tests to pandas 2.0.3 https://github.com/olofk/edalize/commit/2a3db6658752f97c61048664b478ebfe65a909f8 --- .../python-modules/edalize/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 9455cdc1b81d..2b8833196014 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -52,6 +52,21 @@ buildPythonPackage rec { "edalize" ]; + disabledTests = [ + # disable failures related to pandas 2.1.0 apply(...,errors="ignore") + # behavior change. upstream pins pandas to 2.0.3 as of 2023-10-10 + # https://github.com/olofk/edalize/commit/2a3db6658752f97c61048664b478ebfe65a909f8 + "test_picorv32_artix7_summary" + "test_picorv32_artix7_resources" + "test_picorv32_artix7_timing" + "test_picorv32_kusp_summary" + "test_picorv32_kusp_resources" + "test_picorv32_kusp_timing" + "test_linux_on_litex_vexriscv_arty_a7_summary" + "test_linux_on_litex_vexriscv_arty_a7_resources" + "test_linux_on_litex_vexriscv_arty_a7_timing" + ]; + disabledTestPaths = [ "tests/test_questa_formal.py" "tests/test_slang.py" From e19ec2fa8c4fcbe9934b640142bc465b4079675f Mon Sep 17 00:00:00 2001 From: Anna Lee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Wed, 15 Nov 2023 21:14:49 +0000 Subject: [PATCH 2/2] python311Packages.edalize: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/edalize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 2b8833196014..0005a4cb2e63 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "olofk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jsrJr/iuezh9/KL0PykWB1XKev4Wr5QeDh0ZWNMZSp8="; + hash = "sha256-foq1CwIe86d+s7PlhLlGpnJCwrpOyr+uf5/RMLASSJU="; }; postPatch = ''