Skip to content

Commit 7a00b52

Browse files
Merge branch 'main' into postpone_sleep_generation
2 parents 374f17e + 314e348 commit 7a00b52

File tree

7 files changed

+44
-11
lines changed

7 files changed

+44
-11
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:04c35dc5f49f0f503a306397d6d043685f8d2bb822ab515818c4208d7fb2db3a
17-
# created: 2025-01-16T15:24:11.364245182Z
16+
digest: sha256:f016446d6e520e5fb552c45b110cba3f217bffdd3d06bdddd076e9e6d13266cf
17+
# created: 2025-02-21T19:32:52.01306189Z

.github/sync-repo-settings.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,37 @@ branchProtectionRules:
1717
- 'unit_grpc_gcp-3.10'
1818
- 'unit_grpc_gcp-3.11'
1919
- 'unit_grpc_gcp-3.12'
20+
- 'unit_grpc_gcp-3.13'
21+
- 'unit_grpc_gcp-3.14'
2022
- 'unit-3.7'
2123
- 'unit-3.8'
2224
- 'unit-3.9'
2325
- 'unit-3.10'
2426
- 'unit-3.11'
2527
- 'unit-3.12'
28+
- 'unit-3.13'
29+
- 'unit-3.14'
2630
- 'unit_wo_grpc-3.10'
2731
- 'unit_wo_grpc-3.11'
2832
- 'unit_wo_grpc-3.12'
33+
- 'unit_wo_grpc-3.13'
34+
- 'unit_wo_grpc-3.14'
35+
- 'unit_w_prerelease_deps-3.7'
36+
- 'unit_w_prerelease_deps-3.8'
37+
- 'unit_w_prerelease_deps-3.9'
38+
- 'unit_w_prerelease_deps-3.10'
39+
- 'unit_w_prerelease_deps-3.11'
40+
- 'unit_w_prerelease_deps-3.12'
41+
- 'unit_w_prerelease_deps-3.13'
42+
- 'unit_w_prerelease_deps-3.14'
43+
- 'unit_w_async_rest_extra-3.7'
44+
- 'unit_w_async_rest_extra-3.8'
45+
- 'unit_w_async_rest_extra-3.9'
46+
- 'unit_w_async_rest_extra-3.10'
47+
- 'unit_w_async_rest_extra-3.11'
48+
- 'unit_w_async_rest_extra-3.12'
49+
- 'unit_w_async_rest_extra-3.13'
50+
- 'unit_w_async_rest_extra-3.14'
2951
- 'cover'
3052
- 'docs'
3153
- 'docfx'

.github/workflows/unittest.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- "3.11"
2424
- "3.12"
2525
- "3.13"
26+
- "3.14"
2627
exclude:
2728
- option: "_wo_grpc"
2829
python: 3.7
@@ -37,6 +38,7 @@ jobs:
3738
uses: actions/setup-python@v5
3839
with:
3940
python-version: ${{ matrix.python }}
41+
allow-prereleases: true
4042
- name: Install nox
4143
run: |
4244
python -m pip install --upgrade setuptools pip wheel

.kokoro/build.sh

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515

1616
set -eo pipefail
1717

18+
CURRENT_DIR=$(dirname "${BASH_SOURCE[0]}")
19+
1820
if [[ -z "${PROJECT_ROOT:-}" ]]; then
19-
PROJECT_ROOT="github/python-api-core"
21+
PROJECT_ROOT=$(realpath "${CURRENT_DIR}/..")
2022
fi
2123

22-
cd "${PROJECT_ROOT}"
24+
pushd "${PROJECT_ROOT}"
2325

2426
# Disable buffering, so that the logs stream through.
2527
export PYTHONUNBUFFERED=1
@@ -28,10 +30,16 @@ export PYTHONUNBUFFERED=1
2830
env | grep KOKORO
2931

3032
# Setup service account credentials.
31-
export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
33+
if [[ -f "${KOKORO_GFILE_DIR}/service-account.json" ]]
34+
then
35+
export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
36+
fi
3237

3338
# Setup project id.
34-
export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
39+
if [[ -f "${KOKORO_GFILE_DIR}/project-id.json" ]]
40+
then
41+
export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
42+
fi
3543

3644
# If this is a continuous build, send the test log to the FlakyBot.
3745
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
@@ -46,7 +54,7 @@ fi
4654
# If NOX_SESSION is set, it only runs the specified session,
4755
# otherwise run all the sessions.
4856
if [[ -n "${NOX_SESSION:-}" ]]; then
49-
python3 -m nox -s ${NOX_SESSION:-}
57+
python3 -m nox -s ${NOX_SESSION:-}
5058
else
51-
python3 -m nox
59+
python3 -m nox
5260
fi

noxfile.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# Black and flake8 clash on the syntax for ignoring flake8's F401 in this file.
2929
BLACK_EXCLUDES = ["--exclude", "^/google/api_core/operations_v1/__init__.py"]
3030

31-
PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
31+
PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
3232

3333
DEFAULT_PYTHON_VERSION = "3.10"
3434
CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
@@ -95,8 +95,7 @@ def install_prerelease_dependencies(session, constraints_path):
9595
prerel_deps = [
9696
"google-auth",
9797
"googleapis-common-protos",
98-
# Exclude grpcio!=1.67.0rc1 which does not support python 3.13
99-
"grpcio!=1.67.0rc1",
98+
"grpcio",
10099
"grpcio-status",
101100
"proto-plus",
102101
"protobuf",

testing/constraints-3.14.txt

Whitespace-only changes.

tests/asyncio/test_operation_async.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ async def test_constructor():
8484
assert await future.running()
8585

8686

87+
@pytest.mark.asyncio
8788
def test_metadata():
8889
expected_metadata = struct_pb2.Struct()
8990
future, _, _ = make_operation_future(
@@ -176,6 +177,7 @@ async def test_unexpected_result(unused_sleep):
176177
assert "Unexpected state" in "{!r}".format(exception)
177178

178179

180+
@pytest.mark.asyncio
179181
def test_from_gapic():
180182
operation_proto = make_operation_proto(done=True)
181183
operations_client = mock.create_autospec(

0 commit comments

Comments
 (0)