From 4812d82dfa5ef146bda4555c638b6f1a650e6967 Mon Sep 17 00:00:00 2001 From: Mamoru Miura Date: Thu, 15 Dec 2022 00:27:15 +0900 Subject: [PATCH 1/2] fix: fix invalid version specification of pyarrow (#1403) * ci: skip docfx in main 'Kokoro' presubmit (#423) * ci: skip docfx in main 'Kokoro' presubmit * fix: specify default sessions in noxfile * add conditional for cd to project root * ci: use python3 instead of python3.6 in build.sh (#425) * ci: skip docfx in main 'Kokoro' presubmit * fix: specify default sessions in noxfile * fix: use python3 instead of 3.6 * fix: add NOX_SESSION to pass down envvars * fix: remove quotes arround sessions Co-authored-by: Tim Swast * fix: fix invalid version specification of pyarrow Co-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com> Co-authored-by: Tim Swast --- .kokoro/build.sh | 16 ++++++++++------ .kokoro/docs/docs-presubmit.cfg | 11 +++++++++++ .trampolinerc | 2 ++ noxfile.py | 12 ++++++++++++ setup.py | 2 +- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0e71e2aca..058f363e1 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -15,7 +15,11 @@ set -eo pipefail -cd github/python-bigquery +if [[ -z "${PROJECT_ROOT:-}" ]]; then + PROJECT_ROOT="github/python-bigquery" +fi + +cd "${PROJECT_ROOT}" # Disable buffering, so that the logs stream through. export PYTHONUNBUFFERED=1 @@ -30,16 +34,16 @@ export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json") # Remove old nox -python3.6 -m pip uninstall --yes --quiet nox-automation +python3 -m pip uninstall --yes --quiet nox-automation # Install nox -python3.6 -m pip install --upgrade --quiet nox -python3.6 -m nox --version +python3 -m pip install --upgrade --quiet nox +python3 -m nox --version # If NOX_SESSION is set, it only runs the specified session, # otherwise run all the sessions. if [[ -n "${NOX_SESSION:-}" ]]; then - python3.6 -m nox -s "${NOX_SESSION:-}" + python3 -m nox -s ${NOX_SESSION:-} else - python3.6 -m nox + python3 -m nox fi diff --git a/.kokoro/docs/docs-presubmit.cfg b/.kokoro/docs/docs-presubmit.cfg index 111810782..5c216b4bc 100644 --- a/.kokoro/docs/docs-presubmit.cfg +++ b/.kokoro/docs/docs-presubmit.cfg @@ -15,3 +15,14 @@ env_vars: { key: "TRAMPOLINE_IMAGE_UPLOAD" value: "false" } + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/python-bigquery/.kokoro/build.sh" +} + +# Only run this nox session. +env_vars: { + key: "NOX_SESSION" + value: "docs docfx" +} \ No newline at end of file diff --git a/.trampolinerc b/.trampolinerc index 995ee2911..c7d663ae9 100644 --- a/.trampolinerc +++ b/.trampolinerc @@ -18,12 +18,14 @@ required_envvars+=( "STAGING_BUCKET" "V2_STAGING_BUCKET" + "NOX_SESSION" ) # Add env vars which are passed down into the container here. pass_down_envvars+=( "STAGING_BUCKET" "V2_STAGING_BUCKET" + "NOX_SESSION" ) # Prevent unintentional override on the default image. diff --git a/noxfile.py b/noxfile.py index 282330214..c2b80fe86 100644 --- a/noxfile.py +++ b/noxfile.py @@ -25,6 +25,18 @@ BLACK_PATHS = ("docs", "google", "samples", "tests", "noxfile.py", "setup.py") CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() +# 'docfx' is excluded since it only needs to run in 'docs-presubmit' +nox.options.sessions = [ + "unit", + "system", + "snippets", + "cover", + "lint", + "lint_setup_py", + "blacken", + "docs", +] + def default(session): """Default unit test session. diff --git a/setup.py b/setup.py index e46976742..9b4226f1e 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ "pandas": ["pandas>=0.23.0"], "pyarrow": [ # pyarrow 1.0.0 is required for the use of timestamp_as_object keyword. - "pyarrow >= 1.0.0, < 2.0de ; python_version>='3.5'", + "pyarrow >= 1.0.0, < 2.0dev ; python_version>='3.5'", "pyarrow >= 0.16.0, < 0.17.0dev ; python_version<'3.5'", ], "tqdm": ["tqdm >= 4.7.4, <5.0.0dev"], From d6c879d37da7156332fc40faad991e8d78beefd2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 13:32:15 -0400 Subject: [PATCH 2/2] chore(v1): release 1.28.3 (#1442) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 886ae0a48..9615a8129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-cloud-bigquery/#history +## [1.28.3](https://github.com/googleapis/python-bigquery/compare/v1.28.2...v1.28.3) (2022-12-14) + + +### Bug Fixes + +* Fix invalid version specification of pyarrow ([#1403](https://github.com/googleapis/python-bigquery/issues/1403)) ([4812d82](https://github.com/googleapis/python-bigquery/commit/4812d82dfa5ef146bda4555c638b6f1a650e6967)) + ## [1.28.2](https://github.com/googleapis/python-bigquery/compare/v1.28.1...v1.28.2) (2022-06-07) diff --git a/setup.py b/setup.py index 9b4226f1e..b158add27 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ name = "google-cloud-bigquery" description = "Google BigQuery API client library" -version = "1.28.2" +version = "1.28.3" # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta'