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
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.9.3
rev: v0.9.6
hooks:
- id: ruff
files: spatialpandas/
# - repo: https://github.com/codespell-project/codespell
# rev: v2.3.0
# hooks:
# - id: codespell
# additional_dependencies:
# - tomli
- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
hooks:
- id: codespell
additional_dependencies:
- tomli

ci:
autofix_prs: false
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ Bug fixes:
- `read_parquet_dask` fails to read from s3 glob ([#34](https://github.com/holoviz/spatialpandas/issues/34))
- Tests failing with `ValueError: Cannot mask with a boolean indexer containing NA values` ([#41](https://github.com/holoviz/spatialpandas/issues/41))
- Tests in `test_parquet` failing with `TypeError: argument of type 'PosixPath' is not iterable` ([#42](https://github.com/holoviz/spatialpandas/issues/42))
- Create temp directory for partitions explitictly, fixes failure of test `test_pack_partitions_to_parquet`
- Create temp directory for partitions explicitly, fixes failure of test `test_pack_partitions_to_parquet`

Compatibility:

Expand Down
5 changes: 5 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,8 @@ extend-unsafe-fixes = [
[tool.ruff.lint.isort]
known-first-party = ["spatialpandas"]
combine-as-imports = true

[tool.codespell]
ignore-words-list = "ser,vor,secondy"
skip = "examples/Overview.ipynb"
write-changes = true
4 changes: 2 additions & 2 deletions spatialpandas/tests/tools/test_sjoin.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ def test_sjoin(how, gp_points, gp_polygons):
gp_expected = gp_expected.rename(columns={"v_x": "v_left", "v_y": "v_right"})
if how == "right":
gp_expected.index.name = right_gpdf.index.name
gp_expected = gp_expected.rename(columns={"a_left": "index_left", "a_right": "a"}) # geopandas 1.0 compability
gp_expected = gp_expected.rename(columns={"a_left": "index_left", "a_right": "a"}) # geopandas 1.0 compatibility
else:
gp_expected.index.name = left_gpdf.index.name
gp_expected = gp_expected.rename(columns={"b": "index_right", "a_right": "a"}) # geopandas 1.0 compability
gp_expected = gp_expected.rename(columns={"b": "index_right", "a_right": "a"}) # geopandas 1.0 compatibility

# join with spatialpandas
left_spdf = GeoDataFrame(left_gpdf)
Expand Down
Loading