From d9013ff1bb51e1b5bb11ad324ba9ae055fa44d6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 21:56:49 +0000 Subject: [PATCH 1/7] python312Packages.craft-application: 4.6.0 -> 4.7.0 --- pkgs/development/python-modules/craft-application/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 14ddeebae157..7716ce3b978d 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "craft-application"; - version = "4.6.0"; + version = "4.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-application"; tag = version; - hash = "sha256-kDujv7iVUvPfP9g3Ofm0Vso+I6qKBOq9NlFpigd6+Tc="; + hash = "sha256-ywGXzcnWYynmDXjDbSpzn8SroQ7z5fajhlE3JqI3PNk="; }; postPatch = '' From 3783a0f250d17fccac59b12d0b80457be96af930 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 6 Jan 2025 09:33:28 +0000 Subject: [PATCH 2/7] charmcraft: disable two failing tests; broken upstream --- pkgs/by-name/ch/charmcraft/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix index 83efaa904005..526da18da7bf 100644 --- a/pkgs/by-name/ch/charmcraft/package.nix +++ b/pkgs/by-name/ch/charmcraft/package.nix @@ -77,6 +77,8 @@ python3Packages.buildPythonApplication rec { disabledTests = [ # Relies upon the `charm` tool being installed "test_validate_missing_charm" + "test_read_charm_from_yaml_file_self_contained_success[full-bases.yaml]" + "test_read_charm_from_yaml_file_self_contained_success[full-platforms.yaml]" ]; passthru.updateScript = nix-update-script { }; From ab4fe0490b0dec8fb473e863329f0e50a7b8cf09 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 6 Jan 2025 09:34:54 +0000 Subject: [PATCH 3/7] snapcraft: disable broken test due to dependency difference in nixpkgs --- pkgs/by-name/sn/snapcraft/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 77c4aaf02432..c7927f854cdf 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -170,6 +170,7 @@ python3Packages.buildPythonApplication rec { "test_lifecycle_write_component_metadata" "test_parse_info_integrated" "test_patch_elf" + "test_project_platform_unknown_name" "test_remote_builder_init" "test_setup_assets_remote_icon" "test_snap_command_fallback" From 78ef63e579e96da1bc293056d9b237983c18576f Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 6 Jan 2025 09:35:41 +0000 Subject: [PATCH 4/7] rockcraft: disable broken test due to dependency difference in nixpkgs --- pkgs/by-name/ro/rockcraft/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index 38bf29563dd2..15857bf97414 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -48,6 +48,7 @@ python3Packages.buildPythonApplication rec { ''; disabledTests = [ + "test_project_all_platforms_invalid" "test_run_init_flask" "test_run_init_django" ]; From b2697bec57278fec8e02a766c2b94dbd6412b4e7 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 6 Jan 2025 09:54:10 +0000 Subject: [PATCH 5/7] python3Packages.pygit2: import upstream patch to fix Python 3.13 tests --- pkgs/development/python-modules/pygit2/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index a9f0ad9ae17a..9f0e68834fc1 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { url = "https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295.patch"; hash = "sha256-GFFzGVd/9+AcwicwOtBghhonijMp08svXTUZ/4/LmtI="; }) + # temp fix for Python 3.13 until next release after 1.16.0 + (fetchpatch { + url = "https://github.com/libgit2/pygit2/commit/7f143e1c5beec01ec3429aa4db12435ac02977d3.patch"; + hash = "sha256-2SiFFPWVVo9urKRu64AejjTZMoXo2r+v1OwEIF+AzNo="; + }) ]; preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' From aac3861371b34948a07e3f6e7821b021cf4c36d6 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 6 Jan 2025 09:59:41 +0000 Subject: [PATCH 6/7] python3Packages.craft-grammar: temporarily disable broken tests in Python 3.13 --- pkgs/development/python-modules/craft-grammar/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix index a9a73aaf0995..035c4c249b4b 100644 --- a/pkgs/development/python-modules/craft-grammar/default.nix +++ b/pkgs/development/python-modules/craft-grammar/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/unit" ]; + # Temp fix for test incompatibility with Python 3.13 + disabledTests = [ + "test_grammar_strlist_error[value2]" + ]; + passthru.updateScript = nix-update-script { }; meta = { From 05fdade30155608975003902b670d4f54b180571 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 6 Jan 2025 09:59:59 +0000 Subject: [PATCH 7/7] python3Packages.craft-application: temporarily disable broken tests in Python 3.13 --- pkgs/development/python-modules/craft-application/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix index 7716ce3b978d..e74061ddd7bc 100644 --- a/pkgs/development/python-modules/craft-application/default.nix +++ b/pkgs/development/python-modules/craft-application/default.nix @@ -103,6 +103,10 @@ buildPythonPackage rec { "test_to_yaml_file" # Tests expecting pytest-time "test_monitor_builds_success" + # Temporary fix until new release to support Python 3.13 + "test_grammar_aware_part_error" + "test_grammar_aware_part_error[part2]" + "test_grammar_aware_project_error[project0]" ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # These tests have hardcoded "amd64" strings which fail on aarch64