Skip to content
Merged
Show file tree
Hide file tree
Changes from 10 commits
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
2 changes: 1 addition & 1 deletion .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: "3.8"
python-version: "3.9"
channel-priority: strict
- name: Install dependencies
run: |
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python: ["8", "9", "10"] # 3.x
# corresponds to python 3.9, 3.10, 3.11
python: ["9", "10", "11"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In an ideal world, we would be using the full python versions here, but since manipulation of string variables in GHA is difficult I think adding this comment to make things more easily grep-able is a fair compromise

steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -54,7 +55,7 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: "3.8"
python-version: "3.9"
channel-priority: strict
- name: Check dist files
run: |
Expand Down Expand Up @@ -84,7 +85,7 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: "3.8"
python-version: "3.9"
channel-priority: strict
- name: Build source distribution
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ jobs:
name: "Test upstream dev (${{ matrix.os }}, python: ${{ matrix.python }}, distributed: ${{ matrix.distributed }})"
runs-on: ${{ matrix.os }}
env:
CONDA_FILE: continuous_integration/environment-${{ matrix.python }}-dev.yaml
CONDA_FILE: continuous_integration/environment-${{ matrix.python }}.yaml
DASK_SQL_DISTRIBUTED_TESTS: ${{ matrix.distributed }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python: ["3.8", "3.9", "3.10"]
python: ["3.9", "3.10", "3.11"]
distributed: [false]
include:
# run tests on a distributed client
- os: "ubuntu-latest"
python: "3.8"
python: "3.9"
distributed: true
- os: "ubuntu-latest"
python: "3.10"
python: "3.11"
distributed: true
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: "3.8"
python-version: "3.9"
channel-priority: strict
- name: Install Protoc
uses: arduino/setup-protoc@v1
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ jobs:
needs: [detect-ci-trigger]
runs-on: ${{ matrix.os }}
env:
CONDA_FILE: continuous_integration/environment-${{ matrix.python }}-dev.yaml
CONDA_FILE: continuous_integration/environment-${{ matrix.python }}.yaml
DASK_SQL_DISTRIBUTED_TESTS: ${{ matrix.distributed }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python: ["3.8", "3.9", "3.10"]
python: ["3.9", "3.10", "3.11"]
distributed: [false]
include:
# run tests on a distributed client
- os: "ubuntu-latest"
python: "3.8"
python: "3.9"
distributed: true
- os: "ubuntu-latest"
python: "3.10"
python: "3.11"
distributed: true
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
with:
miniforge-variant: Mambaforge
use-mamba: true
python-version: "3.8"
python-version: "3.9"
channel-priority: strict
- name: Install Protoc
uses: arduino/setup-protoc@v1
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ rustup update
To initialize and activate the conda environment for a given Python version:

```
conda env create -f dask-sql/continuous_integration/environment-{$PYTHON_VER}-dev.yaml
conda env create -f dask-sql/continuous_integration/environment-{$PYTHON_VER}.yaml
conda activate dask-sql
```

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ If you want to have the newest (unreleased) `dask-sql` version or if you plan to

Create a new conda environment and install the development environment:

conda env create -f continuous_integration/environment-3.9-dev.yaml
conda env create -f continuous_integration/environment-3.9.yaml

It is not recommended to use `pip` instead of `conda` for the environment setup.

Expand Down
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 All @@ -10,9 +9,10 @@ dependencies:
- fugue>=0.7.3
- intake>=0.6.0
- jsonschema
- libprotobuf=3
- lightgbm
- maturin>=0.12.8
- mlflow
- mlflow>=1.20
- mock
# tpot imports fail with numpy >=1.24.0
# https://github.com/EpistasisLab/tpot/issues/1281
Expand All @@ -36,4 +36,3 @@ dependencies:
- tpot
- tzlocal>=2.1
- uvicorn>=0.13.4
- libprotobuf=3
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 All @@ -10,9 +9,10 @@ dependencies:
- fugue>=0.7.3
- intake>=0.6.0
- jsonschema
- libprotobuf=3
- lightgbm
- maturin>=0.12.8
- mlflow
- mlflow>=1.20
- mock
# tpot imports fail with numpy >=1.24.0
# https://github.com/EpistasisLab/tpot/issues/1281
Expand All @@ -28,12 +28,11 @@ dependencies:
- pytest-rerunfailures
- pytest-xdist
- pytest
- python=3.9
- python=3.11
- scikit-learn>=1.0.0
- setuptools-rust>=1.5.2
- sphinx
- sqlalchemy<2
- tpot
- tzlocal>=2.1
- uvicorn>=0.13.4
- libprotobuf=3
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: dask-sql
name: dask-sql-py39
channels:
- conda-forge
- nodefaults
dependencies:
- c-compiler
- dask=2022.3.0
- fastapi=0.69.0
- fugue=0.7.3
- intake=0.6.0
- jsonschema
- libprotobuf=3
- lightgbm
- maturin=0.12.8
- mlflow
- mlflow=1.20
- mock
# tpot imports fail with numpy >=1.24.0
# https://github.com/EpistasisLab/tpot/issues/1281
Expand All @@ -27,12 +27,11 @@ dependencies:
- pytest-rerunfailures
- pytest-xdist
- pytest
- python=3.8
- python=3.9
- scikit-learn=1.0.0
- setuptools-rust=1.5.2
- sphinx
- sqlalchemy<2
- tpot
- tzlocal=2.1
- uvicorn=0.13.4
- libprotobuf=3
4 changes: 2 additions & 2 deletions continuous_integration/gpuci/environment-3.10.yaml
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 All @@ -13,9 +12,10 @@ dependencies:
- fugue>=0.7.3
- intake>=0.6.0
- jsonschema
- libprotobuf=3
- lightgbm
- maturin>=0.12.8
- mlflow
- mlflow>=1.20
- mock
- pandas>=1.4.0
- pre-commit
Expand Down
31 changes: 15 additions & 16 deletions continuous_integration/gpuci/environment-3.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,37 @@ channels:
- rapidsai-nightly
- nvidia
- conda-forge
- nodefaults
dependencies:
- c-compiler
- dask>=2022.3.0
# FIXME: handling is needed for httpx-based fastapi>=0.87.0
- fastapi>=0.69.0,<0.87.0
- fugue>=0.7.3
- intake>=0.6.0
- dask=2022.3.0
- fastapi=0.69.0
- fugue=0.7.3
- intake=0.6.0
- jsonschema
- libprotobuf=3
- lightgbm
- maturin>=0.12.8
- mlflow
- maturin=0.12.8
- mlflow>=1.20
- mock
- pandas>=1.4.0
- pandas=1.4.0
- pre-commit
- prompt_toolkit>=3.0.8
- prompt_toolkit=3.0.8
- psycopg2
- pyarrow>=6.0.1
- pygments>=2.7.1
- pyarrow=6.0.1
- pygments=2.7.1
- pyhive
- pytest-cov
- pytest-rerunfailures
- pytest-xdist
- pytest
- python=3.9
- scikit-learn>=1.0.0
- setuptools-rust>=1.5.2
- scikit-learn=1.0.0
- setuptools-rust=1.5.2
- sphinx
- sqlalchemy<2
- tpot
- tzlocal>=2.1
- uvicorn>=0.13.4
- tzlocal=2.1
- uvicorn=0.13.4
# GPU-specific requirements
- cudatoolkit=11.5
- cudf=23.06
Expand Down
2 changes: 1 addition & 1 deletion continuous_integration/recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
python:
- 3.8
- 3.9
- 3.10
- 3.11
c_compiler_version:
- 11
rust_compiler_version:
Expand Down
2 changes: 1 addition & 1 deletion dask_planner/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = ["setuptools", "wheel", "setuptools-rust"]

[project]
name = "datafusion_planner"
requires-python = ">=3.8"
requires-python = ">=3.9"
classifiers = [
"Programming Language :: Rust",
"Programming Language :: Python :: Implementation :: CPython",
Expand Down
2 changes: 1 addition & 1 deletion docker/conda.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
python>=3.8
python>=3.9
dask>=2022.3.0
pandas>=1.4.0
jpype1>=1.0.2
Expand Down
1 change: 0 additions & 1 deletion docs/environment.yml
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
2 changes: 1 addition & 1 deletion docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Create a new conda environment and install the development environment:

.. code-block:: bash

conda env create -f continuous_integration/environment-3.9-dev.yaml
conda env create -f continuous_integration/environment-3.9.yaml

It is not recommended to use ``pip`` instead of ``conda``.

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
debug=debug_build,
)
],
python_requires=">=3.8",
python_requires=">=3.9",
setup_requires=sphinx_requirements,
install_requires=[
"dask[dataframe]>=2022.3.0",
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/test_fugue.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ def test_fugue_fsql(client):
assert_eq(return_df, pd.DataFrame({"a": [1], "b": ["world"]}))


@pytest.mark.flaky(reruns=4, condition="sys.version_info < (3, 9)")
# TODO: uncomment if flaky failures persist on python 3.9
# @pytest.mark.flaky(reruns=4, condition="sys.version_info < (3, 9)")
def test_dask_fsql(client):
def assert_fsql(df: pd.DataFrame) -> None:
assert_eq(df, pd.DataFrame({"a": [1]}))
Expand Down