From ccbf91600960170f88fc95981219911959214100 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Jun 2023 14:12:37 +0200 Subject: [PATCH 1/2] python311Packages.objgraph: 3.5.0 -> 3.6.0 Changelog: https://github.com/mgedmin/objgraph/blob/3.6.0/CHANGES.rst --- pkgs/development/python-modules/objgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index ec75d9c452ae..445cc705fac9 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "objgraph"; - version = "3.5.0"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.5" || isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-R1LKW8wOBRLkG4zE0ngKwv07PqvQO36VClWUwGID38Q="; + hash = "sha256-NpVnw3tPL5KBYLb27e3L6o/H6SmDGHf9EFbHipAMF9M="; }; patches = [ From 9b5dc4c95f2fe881565234c35446b82e487fa03c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Jul 2023 16:06:23 +0200 Subject: [PATCH 2/2] python310Packages.jaraco-abode: 5.0.1 -> 5.1.0 Diff: https://github.com/jaraco/jaraco.abode/compare/refs/tags/v5.0.1...v5.1.0 Changelog: https://github.com/jaraco/jaraco.abode/blob/5.1.0/CHANGES.rst --- .../python-modules/jaraco-abode/default.nix | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index 053f77cddfb4..eda1bd94c65c 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -1,41 +1,40 @@ { lib , buildPythonPackage -, pythonOlder +, bx-py-utils +, colorlog , fetchFromGitHub , fetchPypi +, importlib-resources +, jaraco_classes +, jaraco_collections +, jaraco_itertools +, jaraco-context +, jaraco-net +, keyring +, lomond +, more-itertools +, platformdirs +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, requests-toolbelt , setuptools , setuptools-scm -, requests -, lomond -, colorlog -, keyring -, requests-toolbelt -, jaraco_collections -, jaraco-context -, jaraco_classes -, jaraco-net -, more-itertools -, importlib-resources -, bx-py-utils -, platformdirs -, jaraco_itertools -, pytestCheckHook -, requests-mock }: buildPythonPackage rec { pname = "jaraco-abode"; - version = "5.0.1"; + version = "5.1.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; - format = "pyproject"; - src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.abode"; rev = "refs/tags/v${version}"; - hash = "sha256-vKlvZrgRKv2C43JLfl4Wum4Icz9yOKEaB6qKapZ0rwQ="; + hash = "sha256-guLgmhjFgYLRZsQ0j92NXkktZ80bwVvMUJLZeg3dgxE="; }; postPatch = '' @@ -67,13 +66,15 @@ buildPythonPackage rec { jaraco_itertools ]; - pythonImportsCheck = [ "jaraco.abode" ]; - nativeCheckInputs = [ pytestCheckHook requests-mock ]; + pythonImportsCheck = [ + "jaraco.abode" + ]; + preCheck = '' export HOME=$TEMP ''; @@ -83,10 +84,12 @@ buildPythonPackage rec { "test_cookies" "test_empty_cookies" "test_invalid_cookies" + # Issue with the regex + "test_camera_capture_no_control_URLs" ]; meta = with lib; { - changelog = "https://github.com/jaraco/jaraco.abode/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/jaraco/jaraco.abode/blob/${version}/CHANGES.rst"; homepage = "https://github.com/jaraco/jaraco.abode"; description = "Library interfacing to the Abode home security system"; license = licenses.mit;