Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f89785f

Browse files
authoredSep 23, 2024
deps: update ibis version in prerelease tests (#1012)
* deps: update ibis version in prerelease tests * exclude remote function tests from prerelease
1 parent bb04742 commit f89785f

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed
 

‎noxfile.py

+21-3
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ def docfx(session):
543543
)
544544

545545

546-
def prerelease(session: nox.sessions.Session, tests_path):
546+
def prerelease(session: nox.sessions.Session, tests_path, extra_pytest_options=()):
547547
constraints_path = str(
548548
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
549549
)
@@ -588,7 +588,7 @@ def prerelease(session: nox.sessions.Session, tests_path):
588588
session.install(
589589
"--upgrade",
590590
"--pre",
591-
"ibis-framework>=8.0.0,<9.0.0dev",
591+
"ibis-framework>=9.0.0,<=9.2.0",
592592
)
593593
already_installed.add("ibis-framework")
594594

@@ -662,6 +662,7 @@ def prerelease(session: nox.sessions.Session, tests_path):
662662
"--cov-report=term-missing",
663663
"--cov-fail-under=0",
664664
tests_path,
665+
*extra_pytest_options,
665666
*session.posargs,
666667
)
667668

@@ -675,7 +676,24 @@ def unit_prerelease(session: nox.sessions.Session):
675676
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS[-1])
676677
def system_prerelease(session: nox.sessions.Session):
677678
"""Run the system test suite with prerelease dependencies."""
678-
prerelease(session, os.path.join("tests", "system", "small"))
679+
small_tests_dir = os.path.join("tests", "system", "small")
680+
681+
# Let's exclude remote function tests from the prerelease tests, since the
682+
# some of the package dependencies propagate to the cloud run functions'
683+
# requirements.txt, and the prerelease package versions may not be available
684+
# in the standard pip install.
685+
# This would mean that we will only rely on the standard remote function
686+
# tests.
687+
small_remote_function_tests = os.path.join(
688+
small_tests_dir, "test_remote_function.py"
689+
)
690+
assert os.path.exists(small_remote_function_tests)
691+
692+
prerelease(
693+
session,
694+
os.path.join("tests", "system", "small"),
695+
(f"--ignore={small_remote_function_tests}",),
696+
)
679697

680698

681699
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)

‎tests/system/large/test_remote_function.py

+3
Original file line numberDiff line numberDiff line change
@@ -1690,6 +1690,9 @@ def analyze(row):
16901690
),
16911691
),
16921692
id="multiindex",
1693+
marks=pytest.mark.skip(
1694+
reason="TODO(b/368639580) revert this skip after fix"
1695+
),
16931696
),
16941697
pytest.param(
16951698
pandas.DataFrame(

0 commit comments

Comments
 (0)
Failed to load comments.