From b4aab7ced4f7f565f9cddd578b8a5ac78571d819 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Apr 2024 08:57:22 +0200 Subject: [PATCH 1/3] python312Packages.jsonargparse: 4.27.7 -> 4.28.0 Diff: https://github.com/omni-us/jsonargparse/compare/refs/tags/v4.27.7...v4.28.0 Changelog: https://github.com/omni-us/jsonargparse/blob/4.28.0/CHANGELOG.rst --- pkgs/development/python-modules/jsonargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 55cf2a95d773..5fd6fff1ab99 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "jsonargparse"; - version = "4.27.7"; + version = "4.28.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "omni-us"; repo = "jsonargparse"; rev = "refs/tags/v${version}"; - hash = "sha256-JWa08jCdtP9xwLaTYw0024DogDC0WQvKZ8xRDTEhsvE="; + hash = "sha256-iw6ntzFkvMg5baOgeUzf3qV1eGGqywINd7e6N781llQ="; }; nativeBuildInputs = [ From 737fb5a5aeb3119ae8ce4a43f32d7921fe33846f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Apr 2024 08:58:11 +0200 Subject: [PATCH 2/3] python312Packages.jsonargparse: refactor --- pkgs/development/python-modules/jsonargparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 5fd6fff1ab99..8074e1e9bbdc 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -37,11 +37,11 @@ buildPythonPackage rec { hash = "sha256-iw6ntzFkvMg5baOgeUzf3qV1eGGqywINd7e6N781llQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyyaml ]; From 92bd0da0a11c1382347fa77c2fb902bfc1426519 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Apr 2024 08:58:37 +0200 Subject: [PATCH 3/3] python312Packages.jsonargparse: format with nixfmt --- .../python-modules/jsonargparse/default.nix | 87 ++++++++----------- 1 file changed, 34 insertions(+), 53 deletions(-) diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 8074e1e9bbdc..dfe1e12df900 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -1,26 +1,27 @@ -{ lib -, argcomplete -, attrs -, buildPythonPackage -, docstring-parser -, fetchFromGitHub -, fsspec -, jsonnet -, jsonschema -, omegaconf -, pydantic -, pytest-subtests -, pytestCheckHook -, pythonOlder -, pyyaml -, reconplogger -, requests -, responses -, ruyaml -, setuptools -, types-pyyaml -, types-requests -, typeshed-client +{ + lib, + argcomplete, + attrs, + buildPythonPackage, + docstring-parser, + fetchFromGitHub, + fsspec, + jsonnet, + jsonschema, + omegaconf, + pydantic, + pytest-subtests, + pytestCheckHook, + pythonOlder, + pyyaml, + reconplogger, + requests, + responses, + ruyaml, + setuptools, + types-pyyaml, + types-requests, + typeshed-client, }: buildPythonPackage rec { @@ -37,13 +38,9 @@ buildPythonPackage rec { hash = "sha256-iw6ntzFkvMg5baOgeUzf3qV1eGGqywINd7e6N781llQ="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pyyaml - ]; + dependencies = [ pyyaml ]; passthru.optional-dependencies = { all = [ @@ -57,35 +54,21 @@ buildPythonPackage rec { typeshed-client requests ]; - argcomplete = [ - argcomplete - ]; - fsspec = [ - fsspec - ]; + argcomplete = [ argcomplete ]; + fsspec = [ fsspec ]; jsonnet = [ jsonnet # jsonnet-binary ]; - jsonschema = [ - jsonschema - ]; - omegaconf = [ - omegaconf - ]; - reconplogger = [ - reconplogger - ]; - ruyaml = [ - ruyaml - ]; + jsonschema = [ jsonschema ]; + omegaconf = [ omegaconf ]; + reconplogger = [ reconplogger ]; + ruyaml = [ ruyaml ]; signatures = [ docstring-parser typeshed-client ]; - urls = [ - requests - ]; + urls = [ requests ]; }; nativeCheckInputs = [ @@ -95,9 +78,7 @@ buildPythonPackage rec { types-requests ]; - pythonImportsCheck = [ - "jsonargparse" - ]; + pythonImportsCheck = [ "jsonargparse" ]; meta = with lib; { description = "Module to mplement minimal boilerplate CLIs derived from various sources";