diff --git a/pkgs/development/python-modules/certbot-dns-google/default.nix b/pkgs/development/python-modules/certbot-dns-google/default.nix index 1061502b7bac..ed1d24e44ba4 100644 --- a/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -3,33 +3,31 @@ acme, certbot, google-api-python-client, - oauth2client, + google-auth, pytestCheckHook, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "certbot-dns-google"; - format = "setuptools"; - inherit (certbot) src version; - disabled = pythonOlder "3.6"; + pyproject = true; sourceRoot = "${src.name}/certbot-dns-google"; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ acme certbot google-api-python-client - oauth2client + google-auth ]; nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "-p no:cacheprovider" - # https://github.com/certbot/certbot/issues/9988 - "-Wignore::DeprecationWarning" ]; meta = certbot.meta // { diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index a076455e7a50..af7c4d31284c 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -7,7 +7,6 @@ google-api-core, httplib2, uritemplate, - oauth2client, setuptools, pythonOlder, }: @@ -33,7 +32,6 @@ buildPythonPackage rec { google-api-core httplib2 uritemplate - oauth2client ]; # No tests included in archive diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 095159884bf4..11113fa11ed5 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -11,7 +11,6 @@ freezegun, grpcio, mock, - oauth2client, pyasn1-modules, pyjwt, pyopenssl, @@ -68,24 +67,17 @@ buildPythonPackage rec { requests = [ requests ]; }; - nativeCheckInputs = - [ - aioresponses - flask - freezegun - grpcio - mock - ] - ++ lib.optionals (pythonOlder "3.13") [ - oauth2client - ] - ++ [ - pytest-asyncio - pytest-localserver - pytestCheckHook - responses - ] - ++ lib.flatten (lib.attrValues optional-dependencies); + nativeCheckInputs = [ + aioresponses + flask + freezegun + grpcio + mock + pytest-asyncio + pytest-localserver + pytestCheckHook + responses + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "google.auth"