Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop python 3.8, add 3.11 & 3.12 to testing #1143

Merged
merged 35 commits into from
Jan 9, 2024
Merged

Drop python 3.8, add 3.11 & 3.12 to testing #1143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
95461c3
Initial python version bump in CI
charlesbluca May 10, 2023
5060ae4
Add libprotobuf to GPU CI environments
charlesbluca May 10, 2023
eb0d13b
Replace mentions of old env files
charlesbluca May 10, 2023
29e56e0
Merge remote-tracking branch 'origin/main' into drop-py38
charlesbluca May 11, 2023
e454833
Remove strict channel priority to try to unblock env solves?
charlesbluca May 11, 2023
231bbbf
Establish minimum version for mlflow
charlesbluca May 11, 2023
70c7302
Revert "Remove strict channel priority to try to unblock env solves?"
charlesbluca May 11, 2023
2783fc9
Try strict channel priority without nodefaults
charlesbluca May 11, 2023
3b11f9c
Bump mlflow min version to fix windows failures
charlesbluca May 11, 2023
c909c94
Build python 3.11 wheels
charlesbluca May 18, 2023
1b48ab8
Run wheel builds in PR test
charlesbluca May 18, 2023
5ce1507
Try protoc action in wheels build to unblock
charlesbluca May 18, 2023
a0ccafb
Skip hive testing on 3.11 for now
charlesbluca May 19, 2023
6b88ea6
Fix workflow syntax errors
charlesbluca May 19, 2023
9768842
Stop running wheel CI
charlesbluca May 19, 2023
30c9818
Bump pyo3 abi minor version
charlesbluca May 26, 2023
738bbd4
Initial run of pyupgrade to py39
charlesbluca May 26, 2023
36063e6
Merge remote-tracking branch 'origin/main' into drop-py38
charlesbluca May 26, 2023
2d3eaf4
Merge remote-tracking branch 'origin/main' into drop-py38
charlesbluca May 30, 2023
95e8ff9
Continue marking test_dask_fsql as flaky
charlesbluca May 30, 2023
c922000
Merge remote-tracking branch 'upstream/main' into pr/charlesbluca/1143
charlesbluca Nov 7, 2023
3a5842d
More places to drop 3.8
charlesbluca Nov 7, 2023
aff881e
Merge remote-tracking branch 'upstream/main' into drop-py38
charlesbluca Jan 8, 2024
7bf2057
Try running tests on python 3.12
charlesbluca Jan 8, 2024
3e58de2
Add environment file
charlesbluca Jan 8, 2024
e96115a
Skip sasl installation
charlesbluca Jan 8, 2024
025dbd0
Drop protoc build dep
charlesbluca Jan 8, 2024
44ed2ef
Drop mlflow constraint
charlesbluca Jan 8, 2024
cc7f209
Set min version for mlflow
charlesbluca Jan 8, 2024
88ccaaa
Drop mlflow from 3.12 tests for now
charlesbluca Jan 8, 2024
0eeb338
Relocate docker/server files to continuous_integration
charlesbluca Jan 8, 2024
5d501c4
Unpin dask/distributed
charlesbluca Jan 9, 2024
bdcb0e3
unpin 3.9 gpu environment
charlesbluca Jan 9, 2024
78df128
add 3.12 to classifiers
charlesbluca Jan 9, 2024
ae174c1
unpin dask in gpuci 3.9
charlesbluca Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove strict channel priority to try to unblock env solves?
  • Loading branch information
@charlesbluca
charlesbluca committed May 11, 2023
commit e4548339f7284915ed6a5eb79121ed6a2ae260d3
4 changes: 1 addition & 3 deletions .github/workflows/test-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ jobs:
miniforge-variant: Mambaforge
use-mamba: true
python-version: ${{ matrix.python }}
channel-priority: strict
activate-environment: dask-sql
environment-file: ${{ env.CONDA_FILE }}
- name: Optionally update upstream cargo dependencies
Expand All @@ -82,7 +81,7 @@ jobs:
- name: Install upstream dev Dask
if: env.which_upstream == 'Dask'
run: |
mamba install --no-channel-priority dask/label/dev::dask
mamba install dask/label/dev::dask
- name: Install pytest-reportlog
run: |
# TODO: add pytest-reportlog to testing environments if we move over to JSONL output
Expand Down Expand Up @@ -111,7 +110,6 @@ jobs:
miniforge-variant: Mambaforge
use-mamba: true
python-version: "3.9"
channel-priority: strict
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:
miniforge-variant: Mambaforge
use-mamba: true
python-version: ${{ matrix.python }}
channel-priority: strict
activate-environment: dask-sql
environment-file: ${{ env.CONDA_FILE }}
run-post: ${{ matrix.os != 'windows-latest' && 'true' || 'false' }}
Expand All @@ -82,7 +81,7 @@ jobs:
- name: Optionally install upstream dev Dask
if: needs.detect-ci-trigger.outputs.triggered == 'true'
run: |
mamba install --no-channel-priority dask/label/dev::dask
mamba install dask/label/dev::dask
- name: Test with pytest
run: |
pytest --junitxml=junit/test-results.xml --cov-report=xml -n auto tests --dist loadfile
Expand All @@ -108,7 +107,6 @@ jobs:
miniforge-variant: Mambaforge
use-mamba: true
python-version: "3.9"
channel-priority: strict
- name: Install Protoc
uses: arduino/setup-protoc@v1
with:
Expand Down
1 change: 0 additions & 1 deletion continuous_integration/environment-3.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: dask-sql
channels:
- conda-forge
- nodefaults
dependencies:
- c-compiler
- dask>=2022.3.0
Expand Down
3 changes: 1 addition & 2 deletions continuous_integration/environment-3.11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: dask-sql
name: dask-sql-py311
channels:
- conda-forge
- nodefaults
dependencies:
- c-compiler
- dask>=2022.3.0
Expand Down
1 change: 0 additions & 1 deletion continuous_integration/environment-3.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: dask-sql
channels:
- conda-forge
- nodefaults
dependencies:
- c-compiler
- dask=2022.3.0
Expand Down
1 change: 0 additions & 1 deletion continuous_integration/gpuci/environment-3.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ channels:
- rapidsai-nightly
- nvidia
- conda-forge
- nodefaults
dependencies:
- c-compiler
- dask>=2022.3.0
Expand Down
1 change: 0 additions & 1 deletion continuous_integration/gpuci/environment-3.9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ channels:
- rapidsai-nightly
- nvidia
- conda-forge
- nodefaults
dependencies:
- c-compiler
- dask=2022.3.0
Expand Down
1 change: 0 additions & 1 deletion docs/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: dask-sql-docs
channels:
- conda-forge
- nodefaults
dependencies:
- python=3.9
- sphinx>=4.0.0
Expand Down