Skip to content

Commit f33aab3

Browse files
authored
Merge branch 'main' into renovate/all
2 parents dc162f2 + 917ec58 commit f33aab3

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:240b5bcc2bafd450912d2da2be15e62bc6de2cf839823ae4bf94d4f392b451dc
17-
# created: 2023-06-03T21:25:37.968717478Z
16+
digest: sha256:2d816f26f728ac8b24248741e7d4c461c09764ef9f7be3684d557c9632e46dbd
17+
# created: 2023-06-28T17:03:33.371210701Z

.kokoro/release/common.cfg

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,12 @@ env_vars: {
3838
key: "SECRET_MANAGER_KEYS"
3939
value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
4040
}
41+
42+
# Store the packages we uploaded to PyPI. That way, we have a record of exactly
43+
# what we published, which we can use to generate SBOMs and attestations.
44+
action {
45+
define_artifacts {
46+
regex: "github/python-db-dtypes-pandas/**/*.tar.gz"
47+
strip_prefix: "github/python-db-dtypes-pandas"
48+
}
49+
}

noxfile.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -401,10 +401,9 @@ def docfx(session):
401401

402402
session.install("-e", ".")
403403
session.install(
404-
"sphinx==4.0.1",
404+
"gcp-sphinx-docfx-yaml",
405405
"alabaster",
406406
"recommonmark",
407-
"gcp-sphinx-docfx-yaml",
408407
)
409408

410409
shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
@@ -476,6 +475,7 @@ def prerelease_deps(session):
476475
"grpcio!=1.52.0rc1",
477476
"grpcio-status",
478477
"google-api-core",
478+
"google-auth",
479479
"proto-plus",
480480
"google-cloud-testutils",
481481
# dependencies of google-cloud-testutils"
@@ -488,7 +488,6 @@ def prerelease_deps(session):
488488
# Remaining dependencies
489489
other_deps = [
490490
"requests",
491-
"google-auth",
492491
]
493492
session.install(*other_deps)
494493

0 commit comments

Comments
 (0)