Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 1 addition & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
11 changes: 5 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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-check
- 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$)
Expand Down
20 changes: 3 additions & 17 deletions pixi.toml
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -122,8 +118,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] = "*"
Expand Down Expand Up @@ -186,8 +181,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] = "*"
Expand Down Expand Up @@ -275,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" }
8 changes: 2 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]