From b39fd0c5c5f8e650dfdd0607144d6dae2da47748 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Sep 2023 09:58:30 +0000 Subject: [PATCH 1/3] python310Packages.jaraco-logging: 3.1.2 -> 3.2.0 --- pkgs/development/python-modules/jaraco-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix index e6cd8e253dd8..146daf36619e 100644 --- a/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/pkgs/development/python-modules/jaraco-logging/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "jaraco-logging"; - version = "3.1.2"; + version = "3.2.0"; format = "pyproject"; src = fetchPypi { pname = "jaraco.logging"; inherit version; - hash = "sha256-k6cLizdnd5rWx7Vu6YV5ztd7afFqu8rnSfYsLFnmeTE="; + hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c="; }; pythonNamespaces = [ "jaraco" ]; From 61e80c46c3fc55146d865e2f5a0a84d933ef957e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Sep 2023 14:10:23 +0200 Subject: [PATCH 2/3] python310Packages.jaraco-logging: add changelog to meta --- .../python-modules/jaraco-logging/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix index 146daf36619e..9680690aefc3 100644 --- a/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/pkgs/development/python-modules/jaraco-logging/default.nix @@ -18,7 +18,9 @@ buildPythonPackage rec { hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c="; }; - pythonNamespaces = [ "jaraco" ]; + pythonNamespaces = [ + "jaraco" + ]; nativeBuildInputs = [ setuptools @@ -33,11 +35,14 @@ buildPythonPackage rec { # test no longer packaged with pypi doCheck = false; - pythonImportsCheck = [ "jaraco.logging" ]; + pythonImportsCheck = [ + "jaraco.logging" + ]; meta = with lib; { description = "Support for Python logging facility"; homepage = "https://github.com/jaraco/jaraco.logging"; + changelog = "https://github.com/jaraco/jaraco.logging/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 8e72b02220458350d384f3e9980287f60b7fe991 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Sep 2023 14:12:46 +0200 Subject: [PATCH 3/3] python310Packages.jaraco-logging: disable on unsupported Python releases - remove six --- pkgs/development/python-modules/jaraco-logging/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco-logging/default.nix b/pkgs/development/python-modules/jaraco-logging/default.nix index 9680690aefc3..5e5e60b39624 100644 --- a/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/pkgs/development/python-modules/jaraco-logging/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools , setuptools-scm , tempora -, six }: buildPythonPackage rec { @@ -12,6 +12,8 @@ buildPythonPackage rec { version = "3.2.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "jaraco.logging"; inherit version; @@ -29,7 +31,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora - six ]; # test no longer packaged with pypi