From ae43897c5a90909f9a726eb3185c96cf2287c81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 10 Mar 2026 09:13:33 +0100 Subject: [PATCH 1/6] chore: Update pre-commit and ruff settings --- .pre-commit-config.yaml | 9 ++++----- pyproject.toml | 8 ++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62e60e646..3b10ad5b8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ default_stages: [pre-commit] repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v6.0.0 + rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # frozen: v6.0.0 hooks: - id: check-builtin-literals - id: check-case-conflict @@ -14,18 +14,17 @@ repos: exclude: (\.min\.js$|\.svg$) - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.14.9 + rev: b969e2851312ca2b24bbec879ba4954341d1bd12 # frozen: v0.15.5 hooks: - id: ruff - id: ruff-format - exclude: \.ipynb$ - repo: https://github.com/hoxbro/clean_notebook - rev: v0.1.17 + rev: 2e6f506fab3cdfbe16bc18fd0d24e828db773b74 # frozen: v0.2.1 hooks: - id: clean-notebook args: [-i, tags] - repo: https://github.com/codespell-project/codespell - rev: v2.4.1 + rev: 2ccb47ff45ad361a21071a7eedda4c37e6ae8c5a # frozen: v2.4.2 hooks: - id: codespell exclude: (\.min\.js$|\.svg$|\.html$) diff --git a/pyproject.toml b/pyproject.toml index 62242a647..b0c17c8b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -222,12 +222,8 @@ write-changes = true line-length = 99 [tool.ruff.lint] -extend-select = [ - "UP", -] -ignore = [ - "UP038", # Use `X | Y` in `isinstance` call instead of `(X, Y)` -] +extend-select = ["UP"] [tool.ruff.format] quote-style = "single" +exclude = ["*.ipynb", "*.md"] From dbdbc080b767781d518d5b2d657b673cae9e0042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 10 Mar 2026 09:52:23 +0100 Subject: [PATCH 2/6] update fugue-sql deps --- pixi.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pixi.toml b/pixi.toml index 7e282e603..b39ef688e 100644 --- a/pixi.toml +++ b/pixi.toml @@ -122,8 +122,7 @@ datashader = ">=0.6.5" duckdb = "*" # In 0.9 fugue added the sql extra but didn't add a fugue-sql conda package, # removing the sql deps from core fugue. Adding them manually here. -qpd = ">=0.4.4" -fugue-sql-antlr = ">=0.2.0" +fugue-sql-antlr = ">=0.2.4" sqlglot = "*" jinja2 = "*" # fugue[sql] = "*" @@ -186,8 +185,7 @@ nbval = "*" # In 0.9 fugue added the sql extra but didn't add a fugue-sql conda package, # removing the sql deps from core fugue. Adding them manually here. -qpd = ">=0.4.4" -fugue-sql-antlr = ">=0.2.0" +fugue-sql-antlr = ">=0.2.4" sqlglot = "*" jinja2 = "*" # fugue[sql] = "*" From 1f2b3edced84613cadfa4fb1fe2961af0b1a96b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 10 Mar 2026 09:52:36 +0100 Subject: [PATCH 3/6] remove pandas3 test --- .github/workflows/test.yaml | 4 ---- pixi.toml | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 90eff77c2..e583c2a1a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -81,10 +81,6 @@ jobs: "os": ["ubuntu-latest", "macos-latest", "windows-latest"], "environment": ["test-310", "test-313", "test-314"], "include": [ - { - "environment": "test-pandas3", - "os": "ubuntu-latest" - }, { "environment": "test-311", "os": "ubuntu-latest" diff --git a/pixi.toml b/pixi.toml index b39ef688e..78b24fa21 100644 --- a/pixi.toml +++ b/pixi.toml @@ -37,10 +37,6 @@ no-default-feature = true features = ["py314", "required", "test-core", "test", "example", "geo", "graphviz", "test-example"] no-default-feature = true -[environments.test-pandas3] -features = ["py313", "required", "test-core", "test", "example", "geo", "graphviz", "test-example", "pandas3"] -no-default-feature = true - [environments.test-core] features = ["py314", "required", "test-core"] no-default-feature = true @@ -273,11 +269,3 @@ pre-commit = "*" [feature.lint.tasks] lint = 'pre-commit run --all-files' lint-install = 'pre-commit install' - -# ================== SPECIAL ==================== - -[feature.pandas3] -channels = ["conda-forge/label/pandas_rc"] - -[feature.pandas3.dependencies] -pandas = { version = ">=3.0.0rc0,<3.0.0", channel = "conda-forge/label/pandas_rc" } From 72c40c9ae82ed4a447c207798f33cf0e28d86c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 10 Mar 2026 09:52:44 +0100 Subject: [PATCH 4/6] remove osx-64 --- pixi.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.toml b/pixi.toml index 78b24fa21..2b98151e2 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,7 +1,7 @@ [workspace] name = "hvplot" channels = ["pyviz/label/dev", "conda-forge"] -platforms = ["linux-64", "osx-arm64", "osx-64", "win-64"] +platforms = ["linux-64", "osx-arm64", "win-64"] [environments] default = [ From 7230562be960f5b77240ed4e1735c81729cd3def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 10 Mar 2026 10:09:10 +0100 Subject: [PATCH 5/6] remove test-313 from default --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e583c2a1a..eabf0811c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -65,7 +65,7 @@ jobs: run: | MATRIX=$(jq -nsc '{ "os": ["ubuntu-latest", "macos-latest", "windows-latest"], - "environment": ["test-310", "test-313", "test-314"], + "environment": ["test-310", "test-314"], "exclude": [ { "environment": "test-310", From 8cee08a0b2ea516982fede7fd29cc9416198d41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Tue, 10 Mar 2026 10:09:38 +0100 Subject: [PATCH 6/6] ruff -> ruff-check --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3b10ad5b8..8fc710fd4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit rev: b969e2851312ca2b24bbec879ba4954341d1bd12 # frozen: v0.15.5 hooks: - - id: ruff + - id: ruff-check - id: ruff-format - repo: https://github.com/hoxbro/clean_notebook rev: 2e6f506fab3cdfbe16bc18fd0d24e828db773b74 # frozen: v0.2.1