From 675e58180f9ddebe4ffcb8be9ea078097647ea5d Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Thu, 16 Apr 2026 06:49:00 +0000 Subject: [PATCH 1/3] chore: reformat google-cloud-dns with nox --- packages/google-cloud-dns/docs/conf.py | 2 +- packages/google-cloud-dns/google/cloud/dns/__init__.py | 6 ++---- packages/google-cloud-dns/google/cloud/dns/_http.py | 1 - packages/google-cloud-dns/google/cloud/dns/changes.py | 1 + packages/google-cloud-dns/google/cloud/dns/client.py | 2 +- packages/google-cloud-dns/google/cloud/dns/zone.py | 1 + packages/google-cloud-dns/setup.py | 1 - packages/google-cloud-dns/tests/unit/test__http.py | 10 ++++------ packages/google-cloud-dns/tests/unit/test_changes.py | 3 +-- packages/google-cloud-dns/tests/unit/test_client.py | 3 +++ packages/google-cloud-dns/tests/unit/test_zone.py | 1 + 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/packages/google-cloud-dns/docs/conf.py b/packages/google-cloud-dns/docs/conf.py index dbb06d613380..58173c9879a9 100644 --- a/packages/google-cloud-dns/docs/conf.py +++ b/packages/google-cloud-dns/docs/conf.py @@ -24,9 +24,9 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys import os import shlex +import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/packages/google-cloud-dns/google/cloud/dns/__init__.py b/packages/google-cloud-dns/google/cloud/dns/__init__.py index d26ba7093581..8b3d7ff4fd86 100644 --- a/packages/google-cloud-dns/google/cloud/dns/__init__.py +++ b/packages/google-cloud-dns/google/cloud/dns/__init__.py @@ -24,12 +24,10 @@ (adding/deleting resource record sets) to a zone. """ -from google.cloud.dns.version import __version__ -from google.cloud.dns.zone import Changes from google.cloud.dns.client import Client -from google.cloud.dns.zone import ManagedZone from google.cloud.dns.resource_record_set import ResourceRecordSet - +from google.cloud.dns.version import __version__ +from google.cloud.dns.zone import Changes, ManagedZone SCOPE = Client.SCOPE diff --git a/packages/google-cloud-dns/google/cloud/dns/_http.py b/packages/google-cloud-dns/google/cloud/dns/_http.py index 51f3f5634af7..5f1b34323e3f 100644 --- a/packages/google-cloud-dns/google/cloud/dns/_http.py +++ b/packages/google-cloud-dns/google/cloud/dns/_http.py @@ -15,7 +15,6 @@ """Create / interact with Google Cloud DNS connections.""" from google.cloud import _http - from google.cloud.dns import __version__ diff --git a/packages/google-cloud-dns/google/cloud/dns/changes.py b/packages/google-cloud-dns/google/cloud/dns/changes.py index aaf03b683958..33fba642c0d9 100644 --- a/packages/google-cloud-dns/google/cloud/dns/changes.py +++ b/packages/google-cloud-dns/google/cloud/dns/changes.py @@ -16,6 +16,7 @@ from google.cloud._helpers import _rfc3339_to_datetime from google.cloud.exceptions import NotFound + from google.cloud.dns.resource_record_set import ResourceRecordSet diff --git a/packages/google-cloud-dns/google/cloud/dns/client.py b/packages/google-cloud-dns/google/cloud/dns/client.py index 780849d70377..66af7c5f3714 100644 --- a/packages/google-cloud-dns/google/cloud/dns/client.py +++ b/packages/google-cloud-dns/google/cloud/dns/client.py @@ -14,8 +14,8 @@ """Client for interacting with the Google Cloud DNS API.""" -from google.api_core import page_iterator from google.api_core import client_options as client_options_mod +from google.api_core import page_iterator from google.cloud.client import ClientWithProject from google.cloud.dns._http import Connection diff --git a/packages/google-cloud-dns/google/cloud/dns/zone.py b/packages/google-cloud-dns/google/cloud/dns/zone.py index 71ab81cc7c54..01bc201f1015 100644 --- a/packages/google-cloud-dns/google/cloud/dns/zone.py +++ b/packages/google-cloud-dns/google/cloud/dns/zone.py @@ -17,6 +17,7 @@ from google.api_core import page_iterator from google.cloud._helpers import _rfc3339_to_datetime from google.cloud.exceptions import NotFound + from google.cloud.dns.changes import Changes from google.cloud.dns.resource_record_set import ResourceRecordSet diff --git a/packages/google-cloud-dns/setup.py b/packages/google-cloud-dns/setup.py index 2e95c50fa9c5..6fe498954f26 100644 --- a/packages/google-cloud-dns/setup.py +++ b/packages/google-cloud-dns/setup.py @@ -18,7 +18,6 @@ import setuptools - # Package metadata. name = "google-cloud-dns" diff --git a/packages/google-cloud-dns/tests/unit/test__http.py b/packages/google-cloud-dns/tests/unit/test__http.py index 3da656d63916..aac2ea19f1ea 100644 --- a/packages/google-cloud-dns/tests/unit/test__http.py +++ b/packages/google-cloud-dns/tests/unit/test__http.py @@ -28,8 +28,7 @@ def _make_one(self, *args, **kw): return self._get_target_class()(*args, **kw) def test_build_api_url_no_extra_query_params(self): - from urllib.parse import parse_qsl - from urllib.parse import urlsplit + from urllib.parse import parse_qsl, urlsplit conn = self._make_one(object()) uri = conn.build_api_url("/foo") @@ -42,8 +41,7 @@ def test_build_api_url_no_extra_query_params(self): self.assertEqual(parms, {}) def test_build_api_url_w_custom_endpoint(self): - from urllib.parse import parse_qsl - from urllib.parse import urlsplit + from urllib.parse import parse_qsl, urlsplit custom_endpoint = "https://foo-dns.googleapis.com" conn = self._make_one(object(), api_endpoint=custom_endpoint) @@ -57,8 +55,7 @@ def test_build_api_url_w_custom_endpoint(self): self.assertEqual(parms, {}) def test_build_api_url_w_extra_query_params(self): - from urllib.parse import parse_qsl - from urllib.parse import urlsplit + from urllib.parse import parse_qsl, urlsplit conn = self._make_one(object()) uri = conn.build_api_url("/foo", {"bar": "baz"}) @@ -70,6 +67,7 @@ def test_build_api_url_w_extra_query_params(self): def test_extra_headers(self): import requests + from google.cloud import _http as base_http http = mock.create_autospec(requests.Session, instance=True) diff --git a/packages/google-cloud-dns/tests/unit/test_changes.py b/packages/google-cloud-dns/tests/unit/test_changes.py index 617110889b4f..05020042b564 100644 --- a/packages/google-cloud-dns/tests/unit/test_changes.py +++ b/packages/google-cloud-dns/tests/unit/test_changes.py @@ -30,8 +30,7 @@ def _make_one(self, *args, **kw): return self._get_target_class()(*args, **kw) def _setUpConstants(self): - from google.cloud._helpers import UTC - from google.cloud._helpers import _NOW + from google.cloud._helpers import _NOW, UTC self.WHEN = _NOW().replace(tzinfo=UTC) diff --git a/packages/google-cloud-dns/tests/unit/test_client.py b/packages/google-cloud-dns/tests/unit/test_client.py index 19829e0f21eb..aa0a72b81694 100644 --- a/packages/google-cloud-dns/tests/unit/test_client.py +++ b/packages/google-cloud-dns/tests/unit/test_client.py @@ -38,6 +38,7 @@ def _make_one(self, *args, **kw): def test_ctor_defaults(self): from google.api_core.client_info import ClientInfo + from google.cloud.dns._http import Connection creds = _make_credentials() @@ -53,6 +54,7 @@ def test_ctor_defaults(self): def test_ctor_w_client_info(self): from google.api_core.client_info import ClientInfo + from google.cloud.dns._http import Connection client_info = ClientInfo() @@ -70,6 +72,7 @@ def test_ctor_w_client_info(self): def test_ctor_w_empty_client_options_object(self): from google.api_core.client_info import ClientInfo from google.api_core.client_options import ClientOptions + from google.cloud.dns._http import Connection creds = _make_credentials() diff --git a/packages/google-cloud-dns/tests/unit/test_zone.py b/packages/google-cloud-dns/tests/unit/test_zone.py index 2b240bb1b762..68cf12deadce 100644 --- a/packages/google-cloud-dns/tests/unit/test_zone.py +++ b/packages/google-cloud-dns/tests/unit/test_zone.py @@ -32,6 +32,7 @@ def _make_one(self, *args, **kw): def _setUpConstants(self): import datetime + from google.cloud._helpers import UTC year = 2015 From 5aaac44825ec2d872b6245f429a6e5368f0ff599 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Thu, 16 Apr 2026 06:49:02 +0000 Subject: [PATCH 2/3] chore: regenerate google-cloud-dns with librarian --- librarian.yaml | 1 - packages/google-cloud-dns/.repo-metadata.json | 20 ++++++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/librarian.yaml b/librarian.yaml index 1474e1b36e00..8b2212ea1603 100644 --- a/librarian.yaml +++ b/librarian.yaml @@ -1883,7 +1883,6 @@ libraries: - name: google-cloud-dns version: 0.36.1 description_override: provides methods that you can use to manage DNS for your applications. - skip_generate: true python: library_type: REST name_pretty_override: Cloud DNS diff --git a/packages/google-cloud-dns/.repo-metadata.json b/packages/google-cloud-dns/.repo-metadata.json index 68c12afd7dd3..3bc0184c2a3f 100644 --- a/packages/google-cloud-dns/.repo-metadata.json +++ b/packages/google-cloud-dns/.repo-metadata.json @@ -1,17 +1,13 @@ { - "name": "dns", - "name_pretty": "Cloud DNS", - "product_documentation": "https://cloud.google.com/dns", + "api_shortname": "dns", "client_documentation": "https://cloud.google.com/python/docs/reference/dns/latest", + "distribution_name": "google-cloud-dns", "issue_tracker": "https://issuetracker.google.com/savedsearches/559772", - "release_level": "preview", "language": "python", "library_type": "REST", - "repo": "googleapis/google-cloud-python", - "distribution_name": "google-cloud-dns", - "requires_billing": true, - "default_version": "", - "codeowner_team": "", - "api_shortname": "dns", - "api_description": "provides methods that you can use to manage DNS for your applications." -} + "name": "dns", + "name_pretty": "Cloud DNS", + "product_documentation": "https://cloud.google.com/dns", + "release_level": "preview", + "repo": "googleapis/google-cloud-python" +} \ No newline at end of file From ca272df62e08ea4b1074f9f8bb22c86cf8360a54 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Mon, 20 Apr 2026 14:27:02 +0000 Subject: [PATCH 3/3] chore: fix import ordering --- packages/google-cloud-dns/google/cloud/dns/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/google-cloud-dns/google/cloud/dns/__init__.py b/packages/google-cloud-dns/google/cloud/dns/__init__.py index 8b3d7ff4fd86..f88076d32529 100644 --- a/packages/google-cloud-dns/google/cloud/dns/__init__.py +++ b/packages/google-cloud-dns/google/cloud/dns/__init__.py @@ -24,9 +24,12 @@ (adding/deleting resource record sets) to a zone. """ +from google.cloud.dns import version + +__version__ = version.__version__ + from google.cloud.dns.client import Client from google.cloud.dns.resource_record_set import ResourceRecordSet -from google.cloud.dns.version import __version__ from google.cloud.dns.zone import Changes, ManagedZone SCOPE = Client.SCOPE