Skip to content

Commit

Permalink
Merge branch 'main' into migrate_to_pixi
Browse files Browse the repository at this point in the history
  • Loading branch information
maximlt committed Jan 21, 2025
2 parents baf990e + 83542ce commit a523f96
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
7 changes: 4 additions & 3 deletions doc/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@
webdriver_control.cleanup()


# From Dask 2024.3.0 they now use `dask_expr` by default
# https://github.com/dask/dask/issues/10995
dask.config.set({'dataframe.query-planning': False})
if Version(dask.__version__).release < (2025, 1, 0):
# From Dask 2024.3.0 they now use `dask_expr` by default
# https://github.com/dask/dask/issues/10995
dask.config.set({'dataframe.query-planning': False})


# https://github.com/pydata/xarray/pull/9182
Expand Down
8 changes: 5 additions & 3 deletions hvplot/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from packaging.version import Version
import dask

optional_markers = {
Expand Down Expand Up @@ -37,6 +38,7 @@ def pytest_collection_modifyitems(config, items):
items[:] = selected


# From Dask 2024.3.0 they now use `dask_expr` by default
# https://github.com/dask/dask/issues/10995
dask.config.set({'dataframe.query-planning': False})
if Version(dask.__version__).release < (2025, 1, 0):
# From Dask 2024.3.0 they now use `dask_expr` by default
# https://github.com/dask/dask/issues/10995
dask.config.set({'dataframe.query-planning': False})
8 changes: 3 additions & 5 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ COVERAGE_CORE = "sysmon"

# Dependencies required to run the notebooks
[feature.example.dependencies]
dask-core = "*" # dask[dataframe]
dask-expr = "*" # dask[dataframe]
dask = "<2025.1.0" # dask[dataframe]
datashader = ">=0.6.5"
duckdb = "*"
# In 0.9 fugue added the sql extra but didn't add a fugue-sql conda package,
Expand Down Expand Up @@ -102,8 +101,7 @@ geodatasets = ">=2023.12.0"

[feature.test-core.dependencies]
# Minimum dependencies required to run the test suite.
dask-core = "*" # dask[dataframe]
dask-expr = "*" # dask[dataframe]
dask = "<2025.1.0" # dask[dataframe]
ipywidgets = "*"
matplotlib = "*"
parameterized = "*"
Expand Down Expand Up @@ -138,7 +136,7 @@ fugue = "*"
# end fugue
"ibis-duckdb" = "*" # ibis-framework[duckdb]
polars = "*"
dask = "*"
dask = "<2025.1.0"
spatialpandas = "*"
duckdb = "*"

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ HoloViz = "https://holoviz.org/"

[project.optional-dependencies]
tests-core = [
"dask[dataframe]",
"dask[dataframe] <2025.1.0",
"ipywidgets",
"matplotlib",
"parameterized",
Expand Down Expand Up @@ -106,7 +106,7 @@ graphviz = [
]
# Dependencies required to run the notebooks
examples = [
"dask[dataframe] >=2021.3.0",
"dask[dataframe] >=2021.3.0,<2025.1.0",
"datashader >=0.6.5",
"duckdb",
"fugue[sql]",
Expand Down

0 comments on commit a523f96

Please sign in to comment.