From f97c6eb6dc641c2fbfb52c9ee811ba8be8c528d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 22:22:41 +0100 Subject: [PATCH 1/3] python312Packages.python-json-logger: 2.0.7 -> 3.2.1 Diff: https://github.com/nhairs/python-json-logger/compare/refs/tags/v2.0.7...v3.2.1 Changelog: https://github.com/nhairs/python-json-logger/releases/tag/v3.2.1 --- .../python-json-logger/default.nix | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index ba9de7ec3d1ea..34731966084aa 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -1,41 +1,40 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools, + fetchFromGitHub, + freezegun, pytestCheckHook, - pythonAtLeast, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "python-json-logger"; - version = "2.0.7"; + version = "3.2.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-I+fsAtNCN8WqHimgcBk6Tqh1g7tOf4/QbT3oJkxLLhw="; + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "nhairs"; + repo = "python-json-logger"; + rev = "refs/tags/v${version}"; + hash = "sha256-dM9/ehPY/BnJSNBq1BiTUpJRigdzbGb3jD8Uhx+hmKc="; }; build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + freezegun + pytestCheckHook + ]; - disabledTests = - lib.optionals (pythonAtLeast "3.12") [ - # https://github.com/madzak/python-json-logger/issues/185 - "test_custom_object_serialization" - "test_percentage_format" - "test_rename_reserved_attrs" - ] - ++ lib.optionals (pythonAtLeast "3.13") [ - # https://github.com/madzak/python-json-logger/issues/198 - "test_json_default_encoder_with_timestamp" - ]; + pythonImportsCheck = [ "pythonjsonlogger" ]; meta = with lib; { description = "Json Formatter for the standard python logger"; - homepage = "https://github.com/madzak/python-json-logger"; + homepage = "https://github.com/nhairs/python-json-logger"; + changelog = "https://github.com/nhairs/python-json-logger/releases/tag/v${version}"; license = licenses.bsdOriginal; maintainers = [ ]; }; From 8ccdc52b53b86ead2fdd79f5d350ce3a84c20cd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Dec 2024 22:23:29 +0100 Subject: [PATCH 2/3] python312Packages.reconplogger: 4.16.1 -> 4.17.0 Diff: https://github.com/omni-us/reconplogger/compare/refs/tags/v4.16.1...v4.17.0 --- pkgs/development/python-modules/reconplogger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix index 0881bc5c3c052..2dd74766ec4eb 100644 --- a/pkgs/development/python-modules/reconplogger/default.nix +++ b/pkgs/development/python-modules/reconplogger/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "reconplogger"; - version = "4.16.1"; + version = "4.17.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "reconplogger"; rev = "refs/tags/v${version}"; - hash = "sha256-F/6vT3jLxpteUFtYNtGyiO/JxeRtwJKpdGXTFJ6IDCE="; + hash = "sha256-1WJU1996ui/yJHGRpswvIeAFh+dpH5NgbfTUk8bhr7Y="; }; build-system = [ setuptools ]; From ef84e94bc6b3b44377472d3caaf507c1208cc219 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 Dec 2024 12:59:37 +0100 Subject: [PATCH 3/3] python312Packages.jupyter-events: 0.10.0 -> 0.11.0 Diff: https://github.com/jupyter/jupyter_events/compare/refs/tags/v0.10.0...v0.11.0 Changelog: https://github.com/jupyter/jupyter_events/releases/tag/v0.11.0 --- .../python-modules/jupyter-events/default.nix | 34 +++++++------------ 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 6a5431fd1abf9..cbb8f16d1216c 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -1,46 +1,38 @@ { lib, buildPythonPackage, + click, fetchFromGitHub, - pythonOlder, - - # build hatchling, - - # runtime jsonschema, + pytest-asyncio, + pytest-console-scripts, + pytestCheckHook, python-json-logger, + pythonOlder, pyyaml, referencing, - traitlets, - - # optionals - click, rich, - - # tests - pytest-asyncio, - pytest-console-scripts, - pytestCheckHook, + traitlets, }: buildPythonPackage rec { pname = "jupyter-events"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "jupyter"; repo = "jupyter_events"; rev = "refs/tags/v${version}"; - hash = "sha256-8aps8aNgXw+XbDgtCvWw+Ij1Cm1N0G+wcL35ySkofOk="; + hash = "sha256-e+BxJc/i5lpljvv6Uwqwrog+nLJ4NOBSqd47Q7DELOE="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ jsonschema python-json-logger pyyaml @@ -68,11 +60,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_events" ]; meta = with lib; { - changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}"; description = "Configurable event system for Jupyter applications and extensions"; - mainProgram = "jupyter-events"; homepage = "https://github.com/jupyter/jupyter_events"; + changelog = "https://github.com/jupyter/jupyter_events/releases/tag/v${version}"; license = licenses.bsd3; maintainers = [ ]; + mainProgram = "jupyter-events"; }; }