Skip to content

Commit 7b7bf49

Browse files
authored
Fix SnowparkPythonSnowflakePythonClientRegressRunner (#3826)
1 parent 01ebcdd commit 7b7bf49

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

scripts/jenkins_regress.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ gpg --quiet --batch --yes --decrypt --passphrase="$GPG_KEY" --output "tests/para
2121
pip install protoc-wheel-0==21.1 mypy-protobuf
2222

2323
# Run linter, Python test and code coverage jobs
24-
exit_code_decorator "python -m tox -c $WORKING_DIR" -e notdoctest-pyarrowcap
24+
exit_code_decorator "python -m tox -c $WORKING_DIR" -e notdoctest-pandascap-pyarrowcap

tests/unit/test_packaging_utils.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ def test_get_downloaded_packages_for_real_python_packages(temp_directory):
136136
Assert that for genuine pypi packages, get_downloaded_packages() actually picks up the correct package names.
137137
To avoid flakiness, we only check for package names.
138138
"""
139-
packages = ["requests", "numpy", "pandas"]
139+
packages = ["requests", "numpy"]
140140
target_folder = os.path.join(temp_directory, "packages")
141141
pip_install_packages_to_target_folder(packages, target_folder)
142142
for package in packages:
@@ -148,9 +148,9 @@ def test_get_downloaded_packages_for_real_python_packages(temp_directory):
148148
)
149149
package_names = {package.name for package in downloaded_packages_dict.keys()}
150150
for package_name in packages + [
151-
"six",
152-
"pytz",
153-
]: # six and pytz are integral dependencies
151+
"certifi",
152+
"urllib3",
153+
]: # certifi and urllib3 are integral dependencies
154154
assert package_name in package_names
155155

156156

@@ -162,7 +162,7 @@ def test_pip_timeout(temp_directory):
162162
"""
163163
Assert that timeout parameter works fine.
164164
"""
165-
packages = ["requests", "numpy", "pandas"]
165+
packages = ["requests", "numpy"]
166166
target_folder = os.path.join(temp_directory, "packages")
167167
with pytest.raises(TimeoutExpired):
168168
pip_install_packages_to_target_folder(packages, target_folder, timeout=1)
@@ -295,7 +295,7 @@ def test_identify_supported_packages_all_cases():
295295
reason="Subprocess calls are not allowed within stored procedures",
296296
)
297297
def test_valid_pip_install(temp_directory):
298-
packages = ["requests", "numpy", "pandas"]
298+
packages = ["requests", "numpy"]
299299
target_folder = os.path.join(temp_directory, "packages")
300300
pip_install_packages_to_target_folder(packages, target_folder)
301301
for package in packages:

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ allowlist_externals = bash
4444
description = run the tests with pytest under {basepython}
4545
deps =
4646
{env:SNOWFLAKE_PYTEST_MODIN_JENKINS_PYARROW_CAP}
47+
{env:SNOWFLAKE_PYTEST_MODIN_JENKINS_PANDAS_CAP}
4748
pip >= 19.3.1
4849
pytest-xdist
4950
pytest-timeout
@@ -90,6 +91,7 @@ setenv =
9091
# Cap pyarrow<21 for Snowpark pandas tests on Jenkins due to SNOW-2266293
9192
snowparkpandasjenkins: SNOWFLAKE_PYTEST_MODIN_JENKINS_PYARROW_CAP = pyarrow<21
9293
pyarrowcap: SNOWFLAKE_PYTEST_MODIN_JENKINS_PYARROW_CAP = pyarrow<21
94+
pandascap: SNOWFLAKE_PYTEST_MODIN_JENKINS_PANDAS_CAP = pandas<=2.3.2
9395

9496
passenv =
9597
AWS_ACCESS_KEY_ID

0 commit comments

Comments
 (0)