Skip to content

Commit 1d14771

Browse files
shobsitswastgcf-owl-bot[bot]
authored
test: re-enable system_prerelease tests (#221)
* test: re-enable `system_prerelease` tests * exclude ibis from prerelease install list * install explicit 6.2.0 version for ibis in pre prelease * add unit_prerelease to pre and post submit e2e tests * Update noxfile.py * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Tim Swast <[email protected]> Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent c88d38e commit 1d14771

File tree

3 files changed

+45
-9
lines changed

3 files changed

+45
-9
lines changed

.kokoro/continuous/e2e.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Only run this nox session.
44
env_vars: {
55
key: "NOX_SESSION"
6-
value: "system_noextras e2e notebook samples"
6+
value: "unit_prerelease system_prerelease system_noextras e2e notebook samples"
77
}

.kokoro/presubmit/e2e.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
# Only run this nox session.
44
env_vars: {
55
key: "NOX_SESSION"
6-
value: "system_noextras e2e notebook samples"
6+
value: "unit_prerelease system_prerelease system_noextras e2e notebook samples"
77
}

noxfile.py

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,11 @@ def prerelease(session: nox.sessions.Session, tests_path):
494494
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
495495
)
496496

497+
# Ignore officially released versions of certain packages specified in
498+
# testing/constraints-*.txt and install a more recent, pre-release versions
499+
# directly
500+
already_installed = set()
501+
497502
# PyArrow prerelease packages are published to an alternative PyPI host.
498503
# https://arrow.apache.org/docs/python/install.html#installing-nightly-packages
499504
session.install(
@@ -504,6 +509,8 @@ def prerelease(session: nox.sessions.Session, tests_path):
504509
"--upgrade",
505510
"pyarrow",
506511
)
512+
already_installed.add("pyarrow")
513+
507514
session.install(
508515
"--extra-index-url",
509516
"https://pypi.anaconda.org/scipy-wheels-nightly/simple",
@@ -512,16 +519,48 @@ def prerelease(session: nox.sessions.Session, tests_path):
512519
"--upgrade",
513520
"pandas",
514521
)
522+
already_installed.add("pandas")
523+
524+
# TODO(shobs):
525+
# Commit https://github.com/ibis-project/ibis/commit/c20ba7feab6bdea6c299721310e04dbc10551cc2
526+
# introduced breaking change that removed the following:
527+
# ibis.expr.rules.column
528+
# ibis.expr.rules.value
529+
# ibis.expr.rules.any
530+
# Let's exclude ibis head from prerelease install list for now. Instead, use
531+
# a working ibis-framework version resolved via setup.by (currently resolves
532+
# to version 6.2.0 due to version requirement "6.2.0,<7.0.0dev").
533+
# We should enable the head back once bigframes support a version that
534+
# includes the above commit.
535+
# session.install(
536+
# "--upgrade",
537+
# "-e", # Use -e so that py.typed file is included.
538+
# "git+https://github.com/ibis-project/ibis.git#egg=ibis-framework",
539+
# )
540+
session.install("--no-deps", "ibis-framework==6.2.0")
541+
already_installed.add("ibis-framework")
542+
543+
# Workaround https://github.com/googleapis/python-db-dtypes-pandas/issues/178
544+
session.install("--no-deps", "db-dtypes")
545+
already_installed.add("db-dtypes")
546+
547+
# Ensure we catch breaking changes in the client libraries early.
548+
session.install(
549+
"--upgrade",
550+
"-e",
551+
"git+https://github.com/googleapis/python-bigquery.git#egg=google-cloud-bigquery",
552+
)
553+
already_installed.add("google-cloud-bigquery")
515554
session.install(
516555
"--upgrade",
517-
"-e", # Use -e so that py.typed file is included.
518-
"git+https://github.com/ibis-project/ibis.git#egg=ibis-framework",
556+
"-e",
557+
"git+https://github.com/googleapis/python-bigquery-storage.git#egg=google-cloud-bigquery-storage",
519558
)
520-
# Workaround https://github.com/googleapis/python-db-dtypes-pandas/issues/178
521-
session.install("--no-deps", "db-dtypes")
559+
already_installed.add("google-cloud-bigquery-storage")
522560

523561
# Workaround to install pandas-gbq >=0.15.0, which is required by test only.
524562
session.install("--no-deps", "pandas-gbq")
563+
already_installed.add("pandas-gbq")
525564

526565
session.install(
527566
*set(UNIT_TEST_STANDARD_DEPENDENCIES + SYSTEM_TEST_STANDARD_DEPENDENCIES),
@@ -541,9 +580,6 @@ def prerelease(session: nox.sessions.Session, tests_path):
541580
constraints_text = constraints_file.read()
542581

543582
# Ignore leading whitespace and comment lines.
544-
already_installed = frozenset(
545-
("db-dtypes", "pandas", "pyarrow", "ibis-framework", "pandas-gbq")
546-
)
547583
deps = [
548584
match.group(1)
549585
for match in re.finditer(

0 commit comments

Comments
 (0)