Skip to content

Commit b3684fe

Browse files
authored
fix: allow protobuf 6.x, allow redis 6.x (#1013)
* fix: Allow Protobuf 6.x * resolve 'Unable to locate package libenchant1c2a' * update post processor * remove spellcheck * fix(deps): allow redis 6.x * update constraints-3.13.txt * fix typo
1 parent e8ba4e9 commit b3684fe

29 files changed

+101
-1271
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:52210e0e0559f5ea8c52be148b33504022e1faef4e95fbe4b32d68022af2fa7e
17-
# created: 2024-07-08T19:25:35.862283192Z
16+
digest: sha256:5581906b957284864632cde4e9c51d1cc66b0094990b27e689132fe5cd036046

.kokoro/build.sh

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,30 @@
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-ndb"
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
2628

2729
# Debug: show build environment
2830
env | grep KOKORO
2931

30-
if [[ -f "${KOKORO_GFILE_DIR}/service-account.json" ]]; then
31-
# Setup service account credentials.
32+
# Setup service account credentials.
33+
if [[ -f "${KOKORO_GFILE_DIR}/service-account.json" ]]
34+
then
3235
export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
3336
fi
3437

3538
# Setup project id.
36-
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")
3742

3843
if [[ -f "${KOKORO_GFILE_DIR}/service-account.json" ]]; then
3944
# Configure local Redis to be used
@@ -49,6 +54,7 @@ if [[ -f "${KOKORO_GFILE_DIR}/service-account.json" ]]; then
4954
gcloud --quiet --verbosity=debug datastore indexes create tests/system/index.yaml
5055
fi
5156

57+
fi
5258

5359
# If this is a continuous build, send the test log to the FlakyBot.
5460
# See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
@@ -63,7 +69,7 @@ fi
6369
# If NOX_SESSION is set, it only runs the specified session,
6470
# otherwise run all the sessions.
6571
if [[ -n "${NOX_SESSION:-}" ]]; then
66-
python3 -m nox -s ${NOX_SESSION:-}
72+
python3 -m nox -s ${NOX_SESSION:-}
6773
else
68-
python3 -m nox
74+
python3 -m nox
6975
fi

.kokoro/docker/docs/Dockerfile

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)