From 04833c6bd87b38c1df97db992421fbddbe602e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 11 Feb 2024 09:39:52 -0800 Subject: [PATCH 1/5] python311Packages.google-auth: 2.21.0 -> 2.27.0 Changelog: https://github.com/googleapis/google-auth-library-python/blob/v2.27.0/CHANGELOG.md --- .../python-modules/google-auth/default.nix | 30 ++++++------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 4785bed59fb3..905f301c2cc8 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , cachetools , cryptography -, fetchpatch , fetchPypi , flask , freezegun @@ -22,40 +21,29 @@ , requests , responses , rsa -, six -, urllib3 +, setuptools }: buildPythonPackage rec { pname = "google-auth"; - version = "2.21.0"; - format = "setuptools"; + version = "2.27.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-so6ASOV3J+fPDlvY5ydrISrvR2ZUoJURNUqoJ1O0XGY="; + hash = "sha256-6GOlbMwtjvqD33qAJyYB5DSH+ppyijdiBchsJqrvqCE="; }; - patches = [ - # Although the migration to urllib3-2.0.0 is incomplete, - # the discussion in the following PR has addressed the concerns. - # https://github.com/googleapis/google-auth-library-python/pull/1290 - (fetchpatch { - name = "support-urllib3_2.patch"; - url = "https://github.com/googleapis/google-auth-library-python/commit/9ed006d02d7c9de3e6898ee819648c2fd3367c1d.patch"; - hash = "sha256-64g0GzZeyO8l/s1jqfsogr8pTOBbG9xfp/UeVZNA4q8="; - includes = [ "google/auth/transport/urllib3.py" ]; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ cachetools pyasn1-modules rsa - six - urllib3 ]; passthru.optional-dependencies = { @@ -68,6 +56,7 @@ buildPythonPackage rec { pyopenssl ]; pyopenssl = [ + cryptography pyopenssl ]; reauth = [ @@ -90,8 +79,7 @@ buildPythonPackage rec { pytestCheckHook responses ] ++ passthru.optional-dependencies.aiohttp - # `cryptography` is still required on `aarch64-darwin` for `tests/crypt/*` - ++ (if (stdenv.isDarwin && stdenv.isAarch64) then [ cryptography ] else passthru.optional-dependencies.enterprise_cert) + ++ passthru.optional-dependencies.enterprise_cert ++ passthru.optional-dependencies.reauth; pythonImportsCheck = [ From b7c377eb94f09fe60bd805be06dd6490d38f285e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 11 Feb 2024 09:50:17 -0800 Subject: [PATCH 2/5] python311Packages.google-auth-oauthlib: 1.1.0 -> 1.2.0 Changelog: https://github.com/googleapis/google-auth-library-python-oauthlib/blob/v1.2.0/CHANGELOG.md --- .../python-modules/google-auth-oauthlib/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 2a24f4c04b03..abc6fef98d09 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, setuptools , click , mock , pytestCheckHook @@ -12,16 +13,20 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-g+qMOwiB5FN5C6/0RI6KYRKsh3jR3p2gtoAQuEOTevs="; + hash = "sha256-KS0tN4M0nysHNKCgIHseHjIqwZPCwJ2PfGE/t8xQHqg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-auth requests-oauthlib @@ -43,9 +48,11 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/googleapis/google-auth-library-python-oauthlib/blob/v${version}/CHANGELOG.md"; description = "Google Authentication Library: oauthlib integration"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; license = licenses.asl20; + mainProgram = "google-oauthlib-tool"; maintainers = with maintainers; [ terlar ]; }; } From 58a94a9273b908e45e9915b40a0a2c4b4cc60d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 12 Feb 2024 22:18:43 -0800 Subject: [PATCH 3/5] python311Packages.tensorboard: 2.15.1 -> 2.16.0 Changelog: https://github.com/tensorflow/tensorboard/blob/2.16.0/RELEASE.md --- pkgs/development/python-modules/tensorboard/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index d06c9e6d7d8e..fc35d4719fc5 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,15 +23,15 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.15.1"; + version = "2.16.0"; format = "wheel"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-xGwdHPE6RYxCmGiniyUx2P9faCBY1p7AhAsLx6OPHA8="; + hash = "sha256-JjuQmiAJyzp52qar5kwXhcwxfCWlTk2y/stkKf/FTFg="; }; nativeBuildInputs = [ @@ -76,6 +76,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/tensorflow/tensorboard/blob/${version}/RELEASE.md"; description = "TensorFlow's Visualization Toolkit"; homepage = "https://www.tensorflow.org/"; license = licenses.asl20; From 6954e9a29d8ee13a5cfec908b9eecd017c592db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 12 Feb 2024 22:21:57 -0800 Subject: [PATCH 4/5] python311Packages.tensorboard: add meta.mainProgram --- pkgs/development/python-modules/tensorboard/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index fc35d4719fc5..af45054bac42 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -80,6 +80,7 @@ buildPythonPackage rec { description = "TensorFlow's Visualization Toolkit"; homepage = "https://www.tensorflow.org/"; license = licenses.asl20; + mainProgram = "tensorboard"; maintainers = with maintainers; [ abbradar ]; }; } From 9c5646c100a9aa1892448f0235e7f19a34f789c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Feb 2024 07:55:53 -0800 Subject: [PATCH 5/5] python311Packages.google-auth-oauthlib: set passthru.optional-dependencies --- .../python-modules/google-auth-oauthlib/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index abc6fef98d09..1a20197642e2 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -32,11 +32,14 @@ buildPythonPackage rec { requests-oauthlib ]; + passthru.optional-dependencies = { + tool = [ click ]; + }; + nativeCheckInputs = [ - click mock pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.tool; disabledTests = lib.optionals stdenv.isDarwin [ # This test fails if the hostname is not associated with an IP (e.g., in `/etc/hosts`).