Skip to content

Commit e8556df

Browse files
sfc-gh-jrosesfc-gh-jrose
committed
update daily precommit
1 parent 5e95909 commit e8556df

File tree

3 files changed

+51
-10
lines changed

3 files changed

+51
-10
lines changed

‎.github/workflows/daily_precommit.yml‎

Lines changed: 38 additions & 7 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.8", "3.9", "3.10", "3.11"]
101+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
102102
cloud-provider: [aws, azure, gcp]
103103
steps:
104104
- name: Checkout Code
@@ -145,14 +145,25 @@ jobs:
145145
# Specify SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1 when adding >= python3.12 with no server-side support
146146
# For example, see https://github.com/snowflakedb/snowpark-python/pull/681
147147
shell: bash
148-
- name: Run tests (excluding doctests)
148+
- if: ${{ matrix.python-version != '3.12' }}
149+
name: Run tests (excluding doctests)
149150
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctest-ci"
150151
env:
151152
PYTHON_VERSION: ${{ matrix.python-version }}
152153
cloud_provider: ${{ matrix.cloud-provider }}
153154
PYTEST_ADDOPTS: --color=yes --tb=short
154155
TOX_PARALLEL_NO_SPINNER: 1
155156
shell: bash
157+
- if: ${{ matrix.python-version == '3.12' }}
158+
name: Run tests (excluding doctests and udf tests)
159+
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctestnotudf-ci"
160+
env:
161+
PYTHON_VERSION: ${{ matrix.python-version }}
162+
cloud_provider: ${{ matrix.cloud-provider }}
163+
PYTEST_ADDOPTS: --color=yes --tb=short
164+
TOX_PARALLEL_NO_SPINNER: 1
165+
SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1
166+
shell: bash
156167
- name: Combine coverages
157168
run: python -m tox -e coverage --skip-missing-interpreters false
158169
shell: bash
@@ -217,7 +228,7 @@ jobs:
217228
os:
218229
- image_name: macos-latest
219230
download_name: macos # it includes doctest
220-
python-version: ["3.8", "3.9", "3.10", "3.11"]
231+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
221232
cloud-provider: [aws]
222233
steps:
223234
- name: Checkout Code
@@ -258,14 +269,25 @@ jobs:
258269
PYTEST_ADDOPTS: --color=yes --tb=short --disable_sql_simplifier
259270
TOX_PARALLEL_NO_SPINNER: 1
260271
shell: bash
261-
- name: Run tests (excluding doctests)
272+
- if: ${{ matrix.python-version != '3.12' }}
273+
name: Run tests (excluding doctests)
262274
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctest-ci"
263275
env:
264276
PYTHON_VERSION: ${{ matrix.python-version }}
265277
cloud_provider: ${{ matrix.cloud-provider }}
266278
PYTEST_ADDOPTS: --color=yes --tb=short --disable_sql_simplifier
267279
TOX_PARALLEL_NO_SPINNER: 1
268280
shell: bash
281+
- if: ${{ matrix.python-version == '3.12' }}
282+
name: Run tests (excluding doctests and udf tests)
283+
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctestnotudf-ci"
284+
env:
285+
PYTHON_VERSION: ${{ matrix.python-version }}
286+
cloud_provider: ${{ matrix.cloud-provider }}
287+
PYTEST_ADDOPTS: --color=yes --tb=short --disable_sql_simplifier
288+
TOX_PARALLEL_NO_SPINNER: 1
289+
SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1
290+
shell: bash
269291
- name: Combine coverages
270292
run: python -m tox -e coverage --skip-missing-interpreters false
271293
shell: bash
@@ -354,7 +376,7 @@ jobs:
354376
os:
355377
- image_name: macos-latest
356378
download_name: macos # it includes doctest
357-
python-version: ["3.8", "3.9", "3.10", "3.11"]
379+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
358380
cloud-provider: [aws]
359381
steps:
360382
- name: Checkout Code
@@ -484,7 +506,7 @@ jobs:
484506
os:
485507
- image_name: macos-latest
486508
download_name: macos # it includes doctest
487-
python-version: ["3.8", "3.9", "3.10", "3.11"]
509+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
488510
cloud-provider: [aws]
489511
steps:
490512
- name: Checkout Code
@@ -525,14 +547,23 @@ jobs:
525547
PYTEST_ADDOPTS: --color=yes --tb=short --disable_cte_optimization
526548
TOX_PARALLEL_NO_SPINNER: 1
527549
shell: bash
528-
- name: Run tests (excluding doctests)
550+
- if: ${{ matrix.python-version != '3.12' }}
551+
name: Run tests (excluding doctests)
529552
run: python -m tox -e "py${PYTHON_VERSION/\./}-dailynotdoctest-ci"
530553
env:
531554
PYTHON_VERSION: ${{ matrix.python-version }}
532555
cloud_provider: ${{ matrix.cloud-provider }}
533556
PYTEST_ADDOPTS: --color=yes --tb=short --disable_cte_optimization
534557
TOX_PARALLEL_NO_SPINNER: 1
535558
shell: bash
559+
- if: ${{ matrix.python-version == '3.12' }}
560+
name: Run tests (excluding doctests and udf tests)
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
536567
- name: Combine coverages
537568
run: python -m tox -e coverage --skip-missing-interpreters false
538569
shell: bash

‎.github/workflows/precommit.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,19 +169,28 @@ jobs:
169169
- name: Install tox
170170
run: python -m pip install tox
171171
# we only run doctest on macos
172-
- if: ${{ matrix.os == 'macos-latest' }}
172+
- if: ${{ matrix.os == 'macos-latest' && matrix.python-version != '3.12'}}
173173
name: Run doctests
174174
run: python -m tox -e "py${PYTHON_VERSION}-doctest-notudf-ci"
175175
env:
176176
PYTHON_VERSION: ${{ matrix.python-version }}
177177
cloud_provider: ${{ matrix.cloud-provider }}
178178
PYTEST_ADDOPTS: --color=yes --tb=short
179179
TOX_PARALLEL_NO_SPINNER: 1
180-
SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1
181180
# Specify SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1 when adding >= python3.13 with no server-side support
182181
# For example, see https://github.com/snowflakedb/snowpark-python/pull/681
183182
shell: bash
184183
# do not run other tests for macos
184+
- if: ${{ matrix.os == 'macos-latest' && matrix.python-version == '3.12'}}
185+
name: Run doctests
186+
run: python -m tox -e "py${PYTHON_VERSION}-notudfdoctest-ci"
187+
env:
188+
PYTHON_VERSION: ${{ matrix.python-version }}
189+
cloud_provider: ${{ matrix.cloud-provider }}
190+
PYTEST_ADDOPTS: --color=yes --tb=short
191+
TOX_PARALLEL_NO_SPINNER: 1
192+
SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1
193+
shell: bash
185194
- if: ${{ matrix.os != 'macos-latest' && matrix.python-version != '3.12' }}
186195
name: Run tests (excluding doctests)
187196
run: python -m tox -e "py${PYTHON_VERSION/\./}-notdoctest-ci"
@@ -199,6 +208,7 @@ jobs:
199208
cloud_provider: ${{ matrix.cloud-provider }}
200209
PYTEST_ADDOPTS: --color=yes --tb=short
201210
TOX_PARALLEL_NO_SPINNER: 1
211+
SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1
202212
shell: bash
203213
- name: Combine coverages
204214
run: python -m tox -e coverage --skip-missing-interpreters false
@@ -452,7 +462,6 @@ jobs:
452462
cloud_provider: ${{ matrix.cloud-provider }}
453463
PYTEST_ADDOPTS: --color=yes --tb=short --enable_ast
454464
TOX_PARALLEL_NO_SPINNER: 1
455-
SNOWFLAKE_IS_PYTHON_RUNTIME_TEST: 1
456465
shell: bash
457466
- if: ${{ matrix.python-version == '3.12' }}
458467
name: Run tests for AST (II/II) (excluding udf tests)

‎tox.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ commands =
103103
local: {env:SNOWFLAKE_PYTEST_CMD} --local_testing_mode -m "integ or unit or mock" {posargs:} tests
104104
localnotmultithreaded: {env:SNOWFLAKE_PYTEST_CMD} --disable_multithreading_mode --local_testing_mode -m "integ or unit or mock" {posargs:} tests
105105
dailynotdoctest: {env:SNOWFLAKE_PYTEST_DAILY_CMD} -m "{env:SNOWFLAKE_TEST_TYPE} or udf" {posargs:} tests
106+
dailynotdoctestnotudf: {env:SNOWFLAKE_PYTEST_DAILY_CMD} -m "{env:SNOWFLAKE_TEST_TYPE} and not udf" {posargs:} tests
106107
# Snowpark pandas commands:
107108
snowparkpandasnotdoctest: {env:MODIN_PYTEST_CMD} --durations=20 -m "{env:SNOWFLAKE_TEST_TYPE}" {posargs:} {env:SNOW_1314507_WORKAROUND_RERUN_FLAGS} tests/unit/modin tests/integ/modin tests/integ/test_df_to_snowpark_pandas.py
108109
# This one only run doctest but we still need to include the tests folder to let tests/conftest.py to mark the doctest files for us

0 commit comments

Comments
 (0)