Skip to content

Commit 97f0251

Browse files
authored
Merge branch 'main' into pico-sql
2 parents dc3c498 + 0529726 commit 97f0251

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.librarian/state.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:39628f6e89c9cad27973b9a39a50f7052bec0435ee58c7027b4fa6b655943e31
1+
image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator@sha256:c8612d3fffb3f6a32353b2d1abd16b61e87811866f7ec9d65b59b02eb452a620
22
libraries:
33
- id: google-cloud-bigquery
44
version: 3.38.0

noxfile.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ def default(session, install_extras=True):
9595

9696
# Install all test dependencies, then install local packages in-place.
9797
session.install(
98-
"pytest",
98+
# TODO(https://github.com/pytest-dev/pytest-xdist/issues/1273): Remove once this bug is fixed
99+
"pytest<9",
99100
"google-cloud-testutils",
100101
"pytest-cov",
101102
"pytest-xdist",

0 commit comments

Comments
 (0)