Skip to content

Commit da16d25

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent d9e63b6 commit da16d25

2 files changed

Lines changed: 33 additions & 49 deletions

File tree

pyproject.toml

Lines changed: 30 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ description = "A SpatialData Validator"
99
readme = "README.md"
1010
license = { file = "LICENSE" }
1111
maintainers = [
12-
{ name = "Tim Treis", email = "tim.treis@helmholtz-munich.de" },
1312
{ name = "Lea Zimmermann", email = "lea.zimmermann@helmholtz-munich.de" },
1413
{ name = "Lukas Heumos", email = "lukas.heumos@posteo.net" },
14+
{ name = "Tim Treis", email = "tim.treis@helmholtz-munich.de" },
1515
]
1616
authors = [
17-
{ name = "Tim Treis" },
1817
{ name = "Lea Zimmermann" },
1918
{ name = "Lukas Heumos" },
19+
{ name = "Tim Treis" },
2020
]
2121
requires-python = ">=3.11,<3.14"
2222
classifiers = [
@@ -62,26 +62,20 @@ urls.Documentation = "https://spatialdata-db.readthedocs.io/"
6262
urls.Homepage = "https://github.com/timtreis/spatialdata-db"
6363
urls.Source = "https://github.com/timtreis/spatialdata-db"
6464

65-
[tool.hatch.envs.default]
66-
installer = "uv"
67-
features = [ "dev" ]
68-
69-
[tool.hatch.envs.docs]
70-
extra-features = [ "doc" ]
71-
scripts.build = "sphinx-build -M html docs docs/_build {args}"
72-
scripts.open = "python -m webbrowser -t docs/_build/html/index.html"
73-
scripts.clean = "git clean -fdX -- {args:docs}"
74-
75-
[tool.hatch.envs.hatch-test]
76-
features = [ "test" ]
65+
[tool.hatch]
66+
envs.default.installer = "uv"
67+
envs.default.features = [ "dev" ]
68+
envs.docs.extra-features = [ "doc" ]
69+
envs.docs.scripts.build = "sphinx-build -M html docs docs/_build {args}"
70+
envs.docs.scripts.open = "python -m webbrowser -t docs/_build/html/index.html"
71+
envs.docs.scripts.clean = "git clean -fdX -- {args:docs}"
72+
envs.hatch-test.features = [ "test" ]
7773

7874
[tool.ruff]
7975
line-length = 120
8076
src = [ "src" ]
8177
extend-include = [ "*.ipynb" ]
82-
8378
format.docstring-code-format = true
84-
8579
lint.select = [
8680
"B", # flake8-bugbear
8781
"BLE", # flake8-blind-except
@@ -115,18 +109,18 @@ lint.per-file-ignores."docs/*" = [ "I" ]
115109
lint.per-file-ignores."tests/*" = [ "D" ]
116110
lint.pydocstyle.convention = "numpy"
117111

118-
[tool.pytest.ini_options]
119-
testpaths = [ "tests" ]
120-
xfail_strict = true
121-
addopts = [
112+
[tool.pytest]
113+
ini_options.testpaths = [ "tests" ]
114+
ini_options.xfail_strict = true
115+
ini_options.addopts = [
122116
"--import-mode=importlib", # allow using test files with same name
123117
]
124118

125-
[tool.coverage.run]
126-
source = [ "spatialdata_db" ]
127-
omit = [
119+
[tool.coverage]
120+
run.omit = [
128121
"**/test_*.py",
129122
]
123+
run.source = [ "spatialdata_db" ]
130124

131125
[tool.cruft]
132126
skip = [
@@ -140,28 +134,16 @@ skip = [
140134
"docs/notebooks/example.ipynb",
141135
]
142136

143-
[tool.pixi.workspace]
144-
channels = ["conda-forge"]
145-
platforms = ["osx-arm64", "linux-64"]
146-
147-
[tool.pixi.dependencies]
148-
python = ">=3.11"
149-
pip = ">=25.2,<26"
150-
multipledispatch = ">=0.6.0,<0.7"
151-
152-
[tool.pixi.pypi-dependencies]
153-
spatialdata-db = { path = ".", editable = true }
154-
155-
[tool.pixi.feature.py311.dependencies]
156-
python = "3.11.*"
157-
158-
[tool.pixi.feature.py313.dependencies]
159-
python = "3.13.*"
160-
161-
[tool.pixi.environments]
162-
default = { features = ["py313"], solve-group = "py313" }
163-
dev-py311 = { features = ["dev", "test", "py311"], solve-group = "py311" }
164-
dev-py313 = { features = ["dev", "test", "py313"], solve-group = "py313" }
165-
166-
[tool.pixi.tasks]
167-
kernel-install = "python -m ipykernel install --user --name pixi-dev --display-name \"spatialdata-db (dev)\""
137+
[tool.pixi]
138+
dependencies.python = ">=3.11"
139+
dependencies.pip = ">=25.2,<26"
140+
dependencies.multipledispatch = ">=0.6.0,<0.7"
141+
environments.default = { features = [ "py313" ], solve-group = "py313" }
142+
environments.dev-py311 = { features = [ "dev", "test", "py311" ], solve-group = "py311" }
143+
environments.dev-py313 = { features = [ "dev", "test", "py313" ], solve-group = "py313" }
144+
feature.py311.dependencies.python = "3.11.*"
145+
feature.py313.dependencies.python = "3.13.*"
146+
pypi-dependencies.spatialdata-db = { path = ".", editable = true }
147+
tasks.kernel-install = 'python -m ipykernel install --user --name pixi-dev --display-name "spatialdata-db (dev)"'
148+
workspace.channels = [ "conda-forge" ]
149+
workspace.platforms = [ "osx-arm64", "linux-64" ]

scripts/parse_10X_ST_table.ipynb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,9 @@
11291129
],
11301130
"source": [
11311131
"all_data[\"id\"] = all_data.apply(\n",
1132-
" lambda row: f\"{row['uid']}__10X__{row['tech']}__{row['Species']}__{row['organ']}__{row['date']}__{row['Pipeline Version']}\",\n",
1132+
" lambda row: (\n",
1133+
" f\"{row['uid']}__10X__{row['tech']}__{row['Species']}__{row['organ']}__{row['date']}__{row['Pipeline Version']}\"\n",
1134+
" ),\n",
11331135
" axis=1,\n",
11341136
")\n",
11351137
"# optionally add replicate information if available\n",

0 commit comments

Comments
 (0)