Skip to content

Commit 6387a35

Browse files
scverse-botflying-sheepgrst
authored
Update template to v0.6.0 (#241)
Co-authored-by: Phil Schaf <[email protected]> Co-authored-by: Gregor Sturm <[email protected]>
1 parent 44fc9a5 commit 6387a35

File tree

16 files changed

+226
-192
lines changed

16 files changed

+226
-192
lines changed

.cruft.json

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"template": "https://github.com/scverse/cookiecutter-scverse",
3-
"commit": "87a407a65408d75a949c0b54b19fd287475a56f8",
4-
"checkout": "v0.4.0",
3+
"commit": "d383d94fadff9e4e6fdb59d77c68cb900d7cedec",
4+
"checkout": "v0.6.0",
55
"context": {
66
"cookiecutter": {
77
"project_name": "scverse-tutorials",
@@ -10,19 +10,32 @@
1010
"author_full_name": "scverse team",
1111
"author_email": "[email protected]",
1212
"github_user": "scverse",
13-
"project_repo": "https://github.com/scverse/scverse-tutorials",
13+
"github_repo": "scverse-tutorials",
1414
"license": "BSD 3-Clause License",
15+
"ide_integration": true,
1516
"_copy_without_render": [
1617
".github/workflows/build.yaml",
1718
".github/workflows/test.yaml",
1819
"docs/_templates/autosummary/**.rst"
1920
],
21+
"_exclude_on_template_update": [
22+
".github/ISSUE_TEMPLATE/**",
23+
"environment.yml",
24+
"*.md",
25+
"src/**",
26+
"docs/*.md",
27+
"docs/notebooks/**",
28+
"docs/references.bib",
29+
"tests/**",
30+
"tutorial-registry/**"
31+
],
2032
"_render_devdocs": false,
2133
"_jinja2_env_vars": {
2234
"lstrip_blocks": true,
2335
"trim_blocks": true
2436
},
25-
"_template": "https://github.com/scverse/cookiecutter-scverse"
37+
"_template": "https://github.com/scverse/cookiecutter-scverse",
38+
"_commit": "d383d94fadff9e4e6fdb59d77c68cb900d7cedec"
2639
}
2740
},
2841
"directory": null

.editorconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ charset = utf-8
88
trim_trailing_whitespace = true
99
insert_final_newline = true
1010

11-
[*.{yml,yaml}]
12-
indent_size = 2
13-
14-
[.cruft.json]
11+
[{*.{yml,yaml,toml},.cruft.json}]
1512
indent_size = 2
1613

1714
[Makefile]

.github/workflows/execute-nbs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ jobs:
8383
jcache notebook merge $f $f
8484
done
8585
86-
- uses: stefanzweifel/git-auto-commit-action@v4
86+
- uses: stefanzweifel/git-auto-commit-action@v5
8787
with:
8888
commit_message: Render notebooks

.gitignore

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
# Caches
2-
/.*cache/
3-
/node_modules/
4-
/data/
5-
.ipynb_checkpoints/
6-
__pycache__/
7-
81
# Temp files
92
.DS_Store
103
*~
4+
buck-out/
115

12-
# Virtual environments
6+
# Compiled files
137
.venv/
8+
__pycache__/
9+
.ipynb_checkpoints/
10+
.*cache/
1411

15-
# Build artifacts
12+
# Distribution / packaging
1613
/dist/
17-
/docs/generated/
18-
/docs/_build/
1914

20-
# User configuration
21-
/hatch.toml
15+
# Tests and coverage
16+
/data/
17+
/node_modules/
18+
/.coverage*
2219

23-
# IDEs
24-
/.idea/
25-
/.vscode/
20+
# docs
21+
/docs/generated/
22+
/docs/_build/

.pre-commit-config.yaml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,19 @@ default_stages:
66
- pre-push
77
minimum_pre_commit_version: 2.16.0
88
repos:
9-
- repo: https://github.com/rbubley/mirrors-prettier
10-
rev: v3.6.2
9+
- repo: https://github.com/biomejs/pre-commit
10+
rev: v2.2.4
1111
hooks:
12-
- id: prettier
12+
- id: biome-format
13+
exclude: ^\.cruft\.json$ # inconsistent indentation with cruft - file never to be modified manually.
14+
- repo: https://github.com/tox-dev/pyproject-fmt
15+
rev: v2.6.0
16+
hooks:
17+
- id: pyproject-fmt
1318
- repo: https://github.com/astral-sh/ruff-pre-commit
14-
rev: v0.13.1
19+
rev: v0.13.2
1520
hooks:
16-
- id: ruff
21+
- id: ruff-check
1722
types_or: [python, pyi, jupyter]
1823
args: [--fix, --exit-non-zero-on-fix]
1924
- id: ruff-format
@@ -31,23 +36,14 @@ repos:
3136
# Check that there are no merge conflicts (could be generated by template sync)
3237
- id: check-merge-conflict
3338
args: [--assume-in-merge]
34-
- repo: local
35-
hooks:
36-
- id: forbid-to-commit
37-
name: Don't commit rej files
38-
entry: |
39-
Cannot commit .rej files. These indicate merge conflicts that arise during automated template updates.
40-
Fix the merge conflicts manually and remove the .rej files.
41-
language: fail
42-
files: '.*\.rej$'
4339
- repo: https://github.com/python-jsonschema/check-jsonschema
44-
rev: 0.34.0
40+
rev: '0.34.0'
4541
hooks:
4642
- id: check-jsonschema
4743
files: "tutorial-registry/schema.json"
4844
args: ["--check-metaschema"]
4945
- repo: https://github.com/python-jsonschema/check-jsonschema
50-
rev: 0.34.0
46+
rev: '0.34.0'
5147
hooks:
5248
- id: check-jsonschema
5349
files: "tutorial-registry/tutorials/.*/meta.yaml"

.readthedocs.yaml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
# https://docs.readthedocs.io/en/stable/config-file/v2.html
22
version: 2
33
build:
4-
os: ubuntu-22.04
4+
os: ubuntu-24.04
55
tools:
66
python: "3.12"
7-
sphinx:
8-
configuration: docs/conf.py
9-
fail_on_warning: true
10-
python:
11-
install:
12-
- requirements: docs/patched-deps.txt
13-
- method: pip
14-
path: .
15-
extra_requirements:
16-
- docs
7+
jobs:
8+
create_environment:
9+
- asdf plugin add uv
10+
- asdf install uv latest
11+
- asdf global uv latest
12+
build:
13+
html:
14+
- uvx hatch run docs:build
15+
- mv docs/_build $READTHEDOCS_OUTPUT

.vscode/extensions.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"recommendations": [
3+
// GitHub integration
4+
"github.vscode-github-actions",
5+
"github.vscode-pull-request-github",
6+
// Language support
7+
"ms-python.python",
8+
"ms-python.vscode-pylance",
9+
"ms-toolsai.jupyter",
10+
"tamasfe.even-better-toml",
11+
// Dependency management
12+
"ninoseki.vscode-mogami",
13+
// Linting and formatting
14+
"editorconfig.editorconfig",
15+
"charliermarsh.ruff",
16+
"biomejs.biome",
17+
],
18+
}

.vscode/launch.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "Python: Build Documentation",
9+
"type": "debugpy",
10+
"request": "launch",
11+
"module": "sphinx",
12+
"args": ["-M", "html", ".", "_build"],
13+
"cwd": "${workspaceFolder}/docs",
14+
"console": "internalConsole",
15+
"justMyCode": false,
16+
},
17+
],
18+
}

.vscode/settings.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"[python][json][jsonc]": {
3+
"editor.formatOnSave": true,
4+
},
5+
"[python]": {
6+
"editor.defaultFormatter": "charliermarsh.ruff",
7+
"editor.codeActionsOnSave": {
8+
"source.fixAll": "always",
9+
"source.organizeImports": "always",
10+
},
11+
},
12+
"[json][jsonc]": {
13+
"editor.defaultFormatter": "biomejs.biome",
14+
},
15+
"python.analysis.typeCheckingMode": "basic",
16+
}

CHANGELOG.md

Whitespace-only changes.

0 commit comments

Comments
 (0)