Merge branch 'main' into renovate/ubuntu-24.x

.github/.OwlBot.lock.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:d3de8a02819f65001effcbd3ea76ce97e9bcff035c7a89457f40f892c87c5b32
-# created: 2024-07-03T17:43:00.77142528Z
+  digest: sha256:e8dcfd7cbfd8beac3a3ff8d3f3185287ea0625d859168cc80faccfc9a7a00455
+# created: 2024-09-16T21:04:09.091105552Z

.kokoro/generate-docs.sh

@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Update 2024-08-12: We are using python3.10 explicitly everywhere to
+# avoid `test(3.10)` failures.
+
 # Should run regardless of failure status for the generator.
 set +eo pipefail
 
@@ -30,8 +33,8 @@ gcloud auth activate-service-account --key-file ${GOOGLE_APPLICATION_CREDENTIALS
 
 # Install dependencies.
 # Disable dependency resolver as all dependencies should have been laid out.
-python3 -m pip install --no-deps --require-hashes -r .kokoro/requirements.txt
-python3 -m pip install -e .
+python3.10 -m pip install --no-deps --require-hashes -r .kokoro/requirements.txt
+python3.10 -m pip install -e .
 
 # Store the contents of bucket log in a variable to reuse.
 python_bucket_items=$(gsutil ls "gs://docs-staging-v2/docfx-python*")
@@ -100,24 +103,24 @@ for package in $(echo "${python_bucket_items}" | cut -d "-" -f 5- | rev | cut -d
     ## Build HTML docs for googleapis.dev.
     # nox -s docs
 
-    # python3 -m docuploader create-metadata \
+    # python3.10 -m docuploader create-metadata \
     #  --name=$(jq --raw-output '.name // empty' .repo-metadata.json) \
-    #  --version=$(python3 setup.py --version) \
+    #  --version=$(python3.10 setup.py --version) \
     #  --language=$(jq --raw-output '.language // empty' .repo-metadata.json) \
-    #  --distribution-name=$(python3 setup.py --name) \
+    #  --distribution-name=$(python3.10 setup.py --name) \
     #  --product-page=$(jq --raw-output '.product_documentation // empty' .repo-metadata.json) \
     #  --github-repository=$(jq --raw-output '.repo // empty' .repo-metadata.json) \
     #  --issue-tracker=$(jq --raw-output '.issue_tracker // empty' .repo-metadata.json)
 
     # cat docs.metadata
 
     ## upload docs
-    # python3 -m docuploader upload docs/_build/html --metadata-file docs.metadata --staging-bucket "${STAGING_BUCKET}"
+    # python3.10 -m docuploader upload docs/_build/html --metadata-file docs.metadata --staging-bucket "${STAGING_BUCKET}"
 
     # Test running with the plugin version locally.
     if [[ "${TEST_PLUGIN}" == "true" ]]; then
       # --no-use-pep517 is required for django-spanner install issue: see https://github.com/pypa/pip/issues/7953
-      python3 -m pip install --user --no-use-pep517 -e .[all]
+      python3.10 -m pip install --user --no-use-pep517 -e .[all]
       sphinx-build -T -N -D extensions=sphinx.ext.autodoc,sphinx.ext.autosummary,docfx_yaml.extension,sphinx.ext.intersphinx,sphinx.ext.coverage,sphinx.ext.napoleon,sphinx.ext.todo,sphinx.ext.viewcode,recommonmark -b html -d docs/_build/doctrees/ docs/ docs/_build/html/
       continue
     fi
@@ -143,19 +146,19 @@ for package in $(echo "${python_bucket_items}" | cut -d "-" -f 5- | rev | cut -d
       name="iam"
     fi
 
-    python3 -m docuploader create-metadata \
+    python3.10 -m docuploader create-metadata \
       --name=${name} \
-      --version=$(python3 setup.py --version) \
+      --version=$(python3.10 setup.py --version) \
       --language=$(jq --raw-output '.language // empty' .repo-metadata.json) \
-      --distribution-name=$(python3 setup.py --name) \
+      --distribution-name=$(python3.10 setup.py --name) \
       --product-page=$(jq --raw-output '.product_documentation // empty' .repo-metadata.json) \
       --github-repository=$(jq --raw-output '.repo // empty' .repo-metadata.json) \
       --issue-tracker=$(jq --raw-output '.issue_tracker // empty' .repo-metadata.json)
 
     cat docs.metadata
 
     # upload docs
-    python3 -m docuploader upload docs/_build/html/docfx_yaml --metadata-file docs.metadata --destination-prefix docfx --staging-bucket "${V2_STAGING_BUCKET}"
+    python3.10 -m docuploader upload docs/_build/html/docfx_yaml --metadata-file docs.metadata --destination-prefix docfx --staging-bucket "${V2_STAGING_BUCKET}"
   done
 
   # Clean up the repository to make room.
@@ -178,7 +181,7 @@ if [ -n "${monorepo_packages}" ]; then
     # Test running with the plugin version locally.
     if [[ "${TEST_PLUGIN}" == "true" ]]; then
       # --no-use-pep517 is required for django-spanner install issue: see https://github.com/pypa/pip/issues/7953
-      python3 -m pip install --user --no-use-pep517 -e .[all]
+      python3.10 -m pip install --user --no-use-pep517 -e .[all]
       sphinx-build -T -N -D extensions=sphinx.ext.autodoc,sphinx.ext.autosummary,docfx_yaml.extension,sphinx.ext.intersphinx,sphinx.ext.coverage,sphinx.ext.napoleon,sphinx.ext.todo,sphinx.ext.viewcode,recommonmark -b html -d docs/_build/doctrees/ docs/ docs/_build/html/
       continue
     fi
@@ -192,19 +195,19 @@ if [ -n "${monorepo_packages}" ]; then
       continue
     fi
 
-    python3 -m docuploader create-metadata \
+    python3.10 -m docuploader create-metadata \
       --name=$(jq --raw-output '.name // empty' .repo-metadata.json) \
-      --version=$(python3 setup.py --version) \
+      --version=$(python3.10 setup.py --version) \
       --language=$(jq --raw-output '.language // empty' .repo-metadata.json) \
-      --distribution-name=$(python3 setup.py --name) \
+      --distribution-name=$(python3.10 setup.py --name) \
       --product-page=$(jq --raw-output '.product_documentation // empty' .repo-metadata.json) \
       --github-repository=$(jq --raw-output '.repo // empty' .repo-metadata.json) \
       --issue-tracker=$(jq --raw-output '.issue_tracker // empty' .repo-metadata.json)
 
     cat docs.metadata
 
     # upload docs
-    python3 -m docuploader upload docs/_build/html/docfx_yaml --metadata-file docs.metadata --destination-prefix docfx --staging-bucket "${V2_STAGING_BUCKET}"
+    python3.10 -m docuploader upload docs/_build/html/docfx_yaml --metadata-file docs.metadata --destination-prefix docfx --staging-bucket "${V2_STAGING_BUCKET}"
 
     # Clean up the package to make room.
     cd ../

.kokoro/release.sh

@@ -23,7 +23,7 @@ python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /
 export PYTHONUNBUFFERED=1
 
 # Move into the package, build the distribution and upload.
-TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-1")
+TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-2")
 cd github/sphinx-docfx-yaml
 python3 setup.py sdist bdist_wheel
 twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*

.kokoro/release/common.cfg

@@ -28,7 +28,7 @@ before_action {
   fetch_keystore {
     keystore_resource {
       keystore_config_id: 73713
-      keyname: "google-cloud-pypi-token-keystore-1"
+      keyname: "google-cloud-pypi-token-keystore-2"
     }
   }
 }

.kokoro/requirements.in

@@ -1,7 +1,7 @@
 # Library specific extra installations.
 # Extra installations are required to ensure all documentation can be
 # generated and not missed out with the generate-docs script.
-django==3.2.25
+django==4.2.16
 google-cloud-aiplatform[prediction]
 googleapis-common-protos==1.58.0 # pinned for conflict in range specifier.
 grpcio-status==1.48.2 # must be pinned due to protobuf compatibility.

.kokoro/requirements.txt

@@ -38,9 +38,9 @@ cachetools==5.2.0 \
     --hash=sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757 \
     --hash=sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db
     # via google-auth
-certifi==2023.7.22 \
-    --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \
-    --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9
+certifi==2024.7.4 \
+    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
+    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
     # via requests
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
@@ -171,9 +171,9 @@ distlib==0.3.6 \
     --hash=sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46 \
     --hash=sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e
     # via virtualenv
-django==3.2.25 \
-    --hash=sha256:7ca38a78654aee72378594d63e51636c04b8e28574f5505dff630895b5472777 \
-    --hash=sha256:a52ea7fcf280b16f7b739cec38fa6d3f8953a5456986944c3ca97e79882b4e38
+django==4.2.16 \
+    --hash=sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898 \
+    --hash=sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad
     # via -r requirements.in
 docker==6.0.0 \
     --hash=sha256:19e330470af40167d293b0352578c1fa22d74b34d3edf5d4ff90ebc203bbb2f1 \
@@ -677,10 +677,6 @@ python-dotenv==0.21.0 \
     --hash=sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5 \
     --hash=sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045
     # via uvicorn
-pytz==2022.2.1 \
-    --hash=sha256:220f481bdafa09c3955dfbdddb7b57780e9a94f5127e35456a48589b9e0c0197 \
-    --hash=sha256:cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5
-    # via django
 pyyaml==6.0 \
     --hash=sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf \
     --hash=sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293 \
@@ -956,13 +952,13 @@ wheel==0.38.4 \
     --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \
     --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8
     # via -r requirements.in
-zipp==3.8.1 \
-    --hash=sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2 \
-    --hash=sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009
+zipp==3.19.1 \
+    --hash=sha256:2828e64edb5386ea6a52e7ba7cdb17bb30a73a858f5eb6eb93d8d36f5ea26091 \
+    --hash=sha256:35427f6d5594f4acf82d25541438348c26736fa9b3afa2754bcd63cdb99d8e8f
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==68.2.2 \
-    --hash=sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87 \
-    --hash=sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a
+setuptools==70.0.0 \
+    --hash=sha256:54faa7f2e8d2d11bcd2c07bed282eef1046b5c080d1c32add737d7b5817b1ad4 \
+    --hash=sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0
     # via -r requirements.in

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.2.2](https://github.com/googleapis/sphinx-docfx-yaml/compare/v3.2.1...v3.2.2) (2024-09-06)
+
+
+### Bug Fixes
+
+* Ignore disambiguation for repeated entries ([#390](https://github.com/googleapis/sphinx-docfx-yaml/issues/390)) ([917c89b](https://github.com/googleapis/sphinx-docfx-yaml/commit/917c89bece5492dd8cbb09348d05af2a5fec82aa))
+* Retrieve keyword arguments for docstrings ([#389](https://github.com/googleapis/sphinx-docfx-yaml/issues/389)) ([bb6898e](https://github.com/googleapis/sphinx-docfx-yaml/commit/bb6898e054f6c53509f6394ba08eb44a36b8661b))
+
 ## [3.2.1](https://github.com/googleapis/sphinx-docfx-yaml/compare/v3.2.0...v3.2.1) (2024-05-07)