Skip to content

Commit a8c0729

Browse files
authored
Merge branch 'main' into aalam-SNOW-2097908-add-versioned-params-for-optimizations
2 parents 5e61e21 + 1f735bd commit a8c0729

File tree

382 files changed

+22519
-4432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

382 files changed

+22519
-4432
lines changed

.github/workflows/daily_modin_precommit_py39_py310.yml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ jobs:
6262
name: wheel
6363
path: dist/
6464

65-
test-unsupported-py38:
66-
name: Test importing Snowpark pandas with Python 3.8 fails
65+
test-unsupported-modin-or-pandas:
66+
name: Test importing unsupported modin or pandas
6767
needs: build
6868
runs-on: ubuntu-latest
6969
steps:
@@ -72,16 +72,16 @@ jobs:
7272
- name: Set up Python
7373
uses: actions/setup-python@v4
7474
with:
75-
python-version: 3.8
75+
python-version: 3.9
7676
- name: Install protoc
7777
shell: bash
7878
run: .github/scripts/install_protoc.sh
7979
- name: Upgrade setuptools and pip
8080
run: python -m pip install -U setuptools pip
8181
- name: Install tox
8282
run: python -m pip install tox
83-
- name: Ensure importing Snowpark pandas fails on Python 3.8
84-
run: tox -e snowpark_pandas_py38_import_error
83+
- name: Ensure importing unsupported modin or pandas versions fails
84+
run: tox -e snowpark_pandas_modin_pandas_import_error
8585

8686
test-old-np:
8787
name: Tests that Snowpark pandas works with numpy 1.26
@@ -110,6 +110,33 @@ jobs:
110110
- name: Ensure importing Snowpark pandas with numpy 1.26 works
111111
run: tox -e snowpark_pandas_old_np
112112

113+
test-old-modin:
114+
name: Tests that Snowpark pandas works with previous modin version
115+
needs: build
116+
runs-on: ubuntu-latest
117+
steps:
118+
- name: Checkout Code
119+
uses: actions/checkout@v4
120+
- name: Set up Python
121+
uses: actions/setup-python@v4
122+
with:
123+
python-version: 3.9
124+
- name: Decrypt parameters.py
125+
shell: bash
126+
run: .github/scripts/decrypt_parameters.sh
127+
env:
128+
PARAMETER_PASSWORD: ${{ secrets.PARAMETER_PASSWORD }}
129+
CLOUD_PROVIDER: "aws"
130+
- name: Install protoc
131+
shell: bash
132+
run: .github/scripts/install_protoc.sh
133+
- name: Upgrade setuptools and pip
134+
run: python -m pip install -U setuptools pip
135+
- name: Install tox
136+
run: python -m pip install tox
137+
- name: Run tests
138+
run: tox -e modin_previous_version-snowparkpandasdailynotdoctest-modin-ci
139+
113140
test:
114141
name: Test modin-${{ matrix.os.download_name }}-${{ matrix.python-version }}-${{ matrix.cloud-provider }}
115142
needs: build

.github/workflows/daily_precommit.yml

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
download_name: macos
9999
- image_name: windows-latest-64-cores
100100
download_name: windows
101-
python-version: ["3.9", "3.10", "3.11", "3.12"]
101+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
102102
cloud-provider: [aws, azure, gcp]
103103
steps:
104104
- name: Checkout Code
@@ -134,7 +134,8 @@ jobs:
134134
run: python -m pip install -U setuptools pip wheel
135135
- name: Install tox
136136
run: python -m pip install tox
137-
- if: ${{ contains('macos', matrix.os.download_name) }}
137+
# SNOW-2213578: Re-enable the test for 3.13
138+
- if: ${{ contains('macos', matrix.os.download_name) && matrix.python-version != '3.13' }}
138139
name: Run doctests
139140
run: python -m tox -e "py${PYTHON_VERSION}-doctest-notudf-ci"
140141
env:
@@ -145,15 +146,28 @@ jobs:
145146
# Specify SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1 when adding >= python3.12 with no server-side support
146147
# For example, see https://github.com/snowflakedb/snowpark-python/pull/681
147148
shell: bash
148-
- name: Run tests (excluding doctests)
149+
- if: ${{ matrix.python-version != '3.13' }}
150+
name: Run tests (excluding doctests)
149151
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctest-ci"
150152
env:
151153
PYTHON_VERSION: ${{ matrix.python-version }}
152154
cloud_provider: ${{ matrix.cloud-provider }}
153155
PYTEST_ADDOPTS: --color=yes --tb=short
154156
TOX_PARALLEL_NO_SPINNER: 1
155157
shell: bash
158+
# SNOW-2213578 : Remove the test below and run udf tests for 3.13
159+
- if: ${{ matrix.python-version == '3.13' }}
160+
name: Run tests (excluding udf, doctests)
161+
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctestnotudf-ci"
162+
env:
163+
PYTHON_VERSION: ${{ matrix.python-version }}
164+
cloud_provider: ${{ matrix.cloud-provider }}
165+
PYTEST_ADDOPTS: --color=yes --tb=short
166+
TOX_PARALLEL_NO_SPINNER: 1
167+
shell: bash
156168
- name: Run data source tests
169+
# psycopg2 is not supported on macos 3.9
170+
if: ${{ !(contains('macos', matrix.os.download_name) && matrix.python-version == '3.9') }}
157171
run: python -m tox -e datasource
158172
env:
159173
PYTHON_VERSION: ${{ matrix.python-version }}
@@ -360,8 +374,8 @@ jobs:
360374
fail-fast: false
361375
matrix:
362376
os: [macos-latest, windows-latest, ubuntu-latest]
363-
python-version: ["3.9", "3.10", "3.11", "3.12"]
364-
cloud-provider: [aws]
377+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
378+
cloud-provider: [azure]
365379
steps:
366380
- name: Checkout Code
367381
uses: actions/checkout@v4
@@ -426,8 +440,8 @@ jobs:
426440
fail-fast: false
427441
matrix:
428442
os: [macos-latest, windows-latest, ubuntu-latest]
429-
python-version: ["3.9", "3.10", "3.11", "3.12"]
430-
cloud-provider: [aws]
443+
python-version: ["3.9", "3.10", "3.11", "3.12"] # SNOW-2230787 test failing on Python 3.13
444+
cloud-provider: [gcp]
431445
protobuf-version: ["3.20.1", "4.25.3", "5.28.3"]
432446
steps:
433447
- name: Checkout Code
@@ -490,8 +504,8 @@ jobs:
490504
os:
491505
- image_name: macos-latest
492506
download_name: macos # it includes doctest
493-
python-version: ["3.9", "3.10", "3.11", "3.12"]
494-
cloud-provider: [aws]
507+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
508+
cloud-provider: [azure]
495509
steps:
496510
- name: Checkout Code
497511
uses: actions/checkout@v4
@@ -531,14 +545,25 @@ jobs:
531545
PYTEST_ADDOPTS: --color=yes --tb=short --disable_cte_optimization
532546
TOX_PARALLEL_NO_SPINNER: 1
533547
shell: bash
534-
- name: Run tests (excluding doctests)
548+
- if: ${{ matrix.python-version != '3.13' }}
549+
name: Run tests (excluding doctests)
535550
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctest-ci"
536551
env:
537552
PYTHON_VERSION: ${{ matrix.python-version }}
538553
cloud_provider: ${{ matrix.cloud-provider }}
539554
PYTEST_ADDOPTS: --color=yes --tb=short --disable_cte_optimization
540555
TOX_PARALLEL_NO_SPINNER: 1
541556
shell: bash
557+
# SNOW-2213578 : Remove the test below and run udf tests for 3.13
558+
- if: ${{ matrix.python-version == '3.13' }}
559+
name: Run tests (excluding udf, doctests)
560+
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctestnotudf-ci"
561+
env:
562+
PYTHON_VERSION: ${{ matrix.python-version }}
563+
cloud_provider: ${{ matrix.cloud-provider }}
564+
PYTEST_ADDOPTS: --color=yes --tb=short --disable_cte_optimization
565+
TOX_PARALLEL_NO_SPINNER: 1
566+
shell: bash
542567
- name: Combine coverages
543568
run: python -m tox -e coverage --skip-missing-interpreters false
544569
shell: bash
110 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)