From 2e24c5cde4dd01b03ca737a84d8c5e384328421a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Aug 2024 10:11:09 +0000 Subject: [PATCH 1/3] python312Packages.recipe-scrapers: 14.56.0 -> 15.0.0 --- pkgs/development/python-modules/recipe-scrapers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index 690a5def8ef2..d82175c155a7 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.56.0"; + version = "15.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-+9oQLCuR+rRCG5tnyofHd8WMkQ5QPsWfLCnwIDU5d9o="; + hash = "sha256-7tCLzMj5/K+7i8a1hFcilOgU+0Y5R6VdYJK5CK06LLw="; }; nativeBuildInputs = [ setuptools ]; From ef6473869173cb4715e2b36b2ef20ecab5bbf759 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 22 Aug 2024 19:29:31 +0100 Subject: [PATCH 2/3] tandoor-recipes: 1.5.16 -> 1.5.19 --- pkgs/applications/misc/tandoor-recipes/common.nix | 6 +++--- pkgs/applications/misc/tandoor-recipes/default.nix | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index 7b0c1f3897d4..9d177a87d904 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.16"; + version = "1.5.19"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-A5cPO3uybTmAV8zWY90S9vtU/tLgbh1Iqhi+ty0RLhM="; + hash = "sha256-HsBy2HzxBpnwh2RqFQJG0HYReWI0a7E7KsJ5TD+GokY="; }; - yarnHash = "sha256-OAgVaXWTVlKqIgDgKNT1MWN3dYzTqrAGgNAnXLDHE+I="; + yarnHash = "sha256-BnOw9QRXRRoM+CW6OGbjWhLo4h6JX3ZR1kJd8Z/w02M="; meta = with lib; { homepage = "https://tandoor.dev/"; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 489c1fefc7e7..b6d99325f120 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -165,8 +165,11 @@ python.pkgs.pythonPackages.buildPythonPackage rec { # flaky disabledTests = [ + "test_add_duplicate" + "test_reset_inherit_space_fields" "test_search_count" "test_url_import_regex_replace" + "test_url_validator" "test_delete" ]; From 3aa03e3843fcc5f6617751f8ba996239d7c1c90b Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Thu, 22 Aug 2024 19:32:01 +0100 Subject: [PATCH 3/3] recipe-scrapers: add downstream NixOS tests --- .../development/python-modules/recipe-scrapers/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index d82175c155a7..f64e8e68c8e2 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -11,6 +11,7 @@ responses, setuptools, pythonOlder, + nixosTests, }: buildPythonPackage rec { @@ -49,6 +50,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "recipe_scrapers" ]; + passthru = { + tests = { + inherit (nixosTests) mealie tandoor-recipes; + }; + }; + meta = with lib; { description = "Python package for scraping recipes data"; homepage = "https://github.com/hhursev/recipe-scrapers";