Merge pull request #288101 from dotlambda/google-auth-2.27.0 (e009e30d) · Commits · nix / nixpkgs

pkgs/development/python-modules/google-auth-oauthlib/default.nix

+15 −5

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		, stdenv
		, buildPythonPackage
		, fetchPypi
		, setuptools
		, click
		, mock
		, pytestCheckHook
		@@ -12,26 +13,33 @@

		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
		];

		passthru.optional-dependencies = {
		tool = [ click ];
		};

		nativeCheckInputs = [
		click
		mock
		pytestCheckHook
		];
		] ++ passthru.optional-dependencies.tool;

		disabledTests = [
		# Flaky test. See https://github.com/NixOS/nixpkgs/issues/288424#issuecomment-1941609973.
		@@ -46,9 +54,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 ];
		};
		}

pkgs/development/python-modules/google-auth/default.nix

+9 −21

Original line number	Diff line number	Diff line
		@@ -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 = [

pkgs/development/python-modules/tensorboard/default.nix

+5 −3

Original line number	Diff line number	Diff line
		@@ -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,9 +76,11 @@ 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;
		mainProgram = "tensorboard";
		maintainers = with maintainers; [ abbradar ];
		};
		}

Admin message