diff --git a/scripts/jenkins_regress.sh b/scripts/jenkins_regress.sh index f1cd42fd36..591d5cf97a 100644 --- a/scripts/jenkins_regress.sh +++ b/scripts/jenkins_regress.sh @@ -21,4 +21,4 @@ gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output "tests/para pip install protoc-wheel-0==21.1 mypy-protobuf # Run linter, Python test and code coverage jobs -exit_code_decorator "python -m tox -c $WORKING_DIR" -e notdoctest-pyarrowcap +exit_code_decorator "python -m tox -c $WORKING_DIR" -e notdoctest-pandascap-pyarrowcap diff --git a/tests/unit/test_packaging_utils.py b/tests/unit/test_packaging_utils.py index c1e637eee0..58a96f5369 100644 --- a/tests/unit/test_packaging_utils.py +++ b/tests/unit/test_packaging_utils.py @@ -136,7 +136,7 @@ def test_get_downloaded_packages_for_real_python_packages(temp_directory): Assert that for genuine pypi packages, get_downloaded_packages() actually picks up the correct package names. To avoid flakiness, we only check for package names. """ - packages = ["requests", "numpy", "pandas"] + packages = ["requests", "numpy"] target_folder = os.path.join(temp_directory, "packages") pip_install_packages_to_target_folder(packages, target_folder) for package in packages: @@ -148,9 +148,9 @@ def test_get_downloaded_packages_for_real_python_packages(temp_directory): ) package_names = {package.name for package in downloaded_packages_dict.keys()} for package_name in packages + [ - "six", - "pytz", - ]: # six and pytz are integral dependencies + "certifi", + "urllib3", + ]: # certifi and urllib3 are integral dependencies assert package_name in package_names @@ -162,7 +162,7 @@ def test_pip_timeout(temp_directory): """ Assert that timeout parameter works fine. """ - packages = ["requests", "numpy", "pandas"] + packages = ["requests", "numpy"] target_folder = os.path.join(temp_directory, "packages") with pytest.raises(TimeoutExpired): pip_install_packages_to_target_folder(packages, target_folder, timeout=1) @@ -295,7 +295,7 @@ def test_identify_supported_packages_all_cases(): reason="Subprocess calls are not allowed within stored procedures", ) def test_valid_pip_install(temp_directory): - packages = ["requests", "numpy", "pandas"] + packages = ["requests", "numpy"] target_folder = os.path.join(temp_directory, "packages") pip_install_packages_to_target_folder(packages, target_folder) for package in packages: diff --git a/tox.ini b/tox.ini index 3f868efdb0..dbecb19e3d 100644 --- a/tox.ini +++ b/tox.ini @@ -44,6 +44,7 @@ allowlist_externals = bash description = run the tests with pytest under {basepython} deps = {env:SNOWFLAKE_PYTEST_MODIN_JENKINS_PYARROW_CAP} + {env:SNOWFLAKE_PYTEST_MODIN_JENKINS_PANDAS_CAP} pip >= 19.3.1 pytest-xdist pytest-timeout @@ -90,6 +91,7 @@ setenv = # Cap pyarrow<21 for Snowpark pandas tests on Jenkins due to SNOW-2266293 snowparkpandasjenkins: SNOWFLAKE_PYTEST_MODIN_JENKINS_PYARROW_CAP = pyarrow<21 pyarrowcap: SNOWFLAKE_PYTEST_MODIN_JENKINS_PYARROW_CAP = pyarrow<21 + pandascap: SNOWFLAKE_PYTEST_MODIN_JENKINS_PANDAS_CAP = pandas<=2.3.2 passenv = AWS_ACCESS_KEY_ID