From ca282f269974c82669971b484dd84a86d99ffc7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Jun 2023 03:34:19 +0000 Subject: [PATCH 1/3] python310Packages.structlog: 22.3.0 -> 23.1.0 --- pkgs/development/python-modules/structlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index db53686c2caf..c21cc13cf90b 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "structlog"; - version = "22.3.0"; + version = "23.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - hash = "sha256-+r+M+uTXdNBWQf0TGQuZgsCXg2CBKwH8ZE2+uAe0Dzg="; + hash = "sha256-0zHvBMiZB4cGntdYXA7C9V9+FfnDB6sHGuFRYAo/LJw="; }; nativeBuildInputs = [ From d5802550f2abfc1f34038ac76a2aa1d2cf34c05c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jun 2023 10:00:13 +0200 Subject: [PATCH 2/3] python311Packages.structlog: add changelog to meta --- pkgs/development/python-modules/structlog/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index c21cc13cf90b..b3783be4179e 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Painless structural logging"; homepage = "https://github.com/hynek/structlog"; + changelog = "https://github.com/hynek/structlog/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 8afaa1ae0f3f5d18a9c3c715cf990f76d9dffa36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jun 2023 10:02:14 +0200 Subject: [PATCH 3/3] python311Packages.structlog: disable on unsupported Python releases --- .../python-modules/structlog/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index b3783be4179e..c21785f430b6 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -1,17 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, pytestCheckHook -, pytest-asyncio -, pretend , freezegun , hatch-fancy-pypi-readme , hatch-vcs , hatchling +, pretend +, pytest-asyncio +, pytestCheckHook +, pythonAtLeast +, pythonOlder , simplejson , typing-extensions -, pythonAtLeast }: buildPythonPackage rec { @@ -19,6 +19,8 @@ buildPythonPackage rec { version = "23.1.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; @@ -26,22 +28,18 @@ buildPythonPackage rec { hash = "sha256-0zHvBMiZB4cGntdYXA7C9V9+FfnDB6sHGuFRYAo/LJw="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ hatch-fancy-pypi-readme hatch-vcs hatchling ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - pythonImportsCheck = [ - "structlog" - ]; - nativeCheckInputs = [ freezegun pretend @@ -50,6 +48,10 @@ buildPythonPackage rec { simplejson ]; + pythonImportsCheck = [ + "structlog" + ]; + meta = with lib; { description = "Painless structural logging"; homepage = "https://github.com/hynek/structlog";