From d91c57eefcc5b64eb05cc3cd0fc3cd4a1dbd356a Mon Sep 17 00:00:00 2001 From: Shobhit Singh Date: Sun, 22 Sep 2024 07:25:21 +0000 Subject: [PATCH 1/2] deps: update ibis version in prerelease tests --- noxfile.py | 2 +- tests/system/large/test_remote_function.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index f459efef10..a5b452e6ec 100644 --- a/noxfile.py +++ b/noxfile.py @@ -588,7 +588,7 @@ def prerelease(session: nox.sessions.Session, tests_path): session.install( "--upgrade", "--pre", - "ibis-framework>=8.0.0,<9.0.0dev", + "ibis-framework>=9.0.0,<=9.2.0", ) already_installed.add("ibis-framework") diff --git a/tests/system/large/test_remote_function.py b/tests/system/large/test_remote_function.py index e224f65a01..d1e82dd415 100644 --- a/tests/system/large/test_remote_function.py +++ b/tests/system/large/test_remote_function.py @@ -1690,6 +1690,9 @@ def analyze(row): ), ), id="multiindex", + marks=pytest.mark.skip( + reason="TODO(b/368639580) revert this skip after fix" + ), ), pytest.param( pandas.DataFrame( From eccfbfa4b10a11a368da5daf4a98dee64c2debf4 Mon Sep 17 00:00:00 2001 From: Shobhit Singh Date: Sun, 22 Sep 2024 10:22:33 +0000 Subject: [PATCH 2/2] exclude remote function tests from prerelease --- noxfile.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index a5b452e6ec..c704da00a5 100644 --- a/noxfile.py +++ b/noxfile.py @@ -543,7 +543,7 @@ def docfx(session): ) -def prerelease(session: nox.sessions.Session, tests_path): +def prerelease(session: nox.sessions.Session, tests_path, extra_pytest_options=()): constraints_path = str( CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt" ) @@ -662,6 +662,7 @@ def prerelease(session: nox.sessions.Session, tests_path): "--cov-report=term-missing", "--cov-fail-under=0", tests_path, + *extra_pytest_options, *session.posargs, ) @@ -675,7 +676,24 @@ def unit_prerelease(session: nox.sessions.Session): @nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS[-1]) def system_prerelease(session: nox.sessions.Session): """Run the system test suite with prerelease dependencies.""" - prerelease(session, os.path.join("tests", "system", "small")) + small_tests_dir = os.path.join("tests", "system", "small") + + # Let's exclude remote function tests from the prerelease tests, since the + # some of the package dependencies propagate to the cloud run functions' + # requirements.txt, and the prerelease package versions may not be available + # in the standard pip install. + # This would mean that we will only rely on the standard remote function + # tests. + small_remote_function_tests = os.path.join( + small_tests_dir, "test_remote_function.py" + ) + assert os.path.exists(small_remote_function_tests) + + prerelease( + session, + os.path.join("tests", "system", "small"), + (f"--ignore={small_remote_function_tests}",), + ) @nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)