Skip to content

Commit 94c2d9a

Browse files
mandlinsarahgithub-actions[bot]
authored andcommitted
update template
1 parent bd52a96 commit 94c2d9a

File tree

4 files changed

+25
-1
lines changed

4 files changed

+25
-1
lines changed

.cruft.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/iterative/py-template",
3-
"commit": "867297aa15a0deaf5302edd01a2bc7ab87039627",
3+
"commit": "fcdb8b88bbe0a8b13af92f7f816d3c277b5c545a",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

.pre-commit-config.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ repos:
2424
- id: trailing-whitespace
2525
exclude: '^LICENSES/'
2626
- repo: https://github.com/astral-sh/ruff-pre-commit
27+
<<<<<<<
2728
rev: 'v0.6.2'
29+
=======
30+
rev: 'v0.6.8'
31+
>>>>>>>
2832
hooks:
2933
- id: ruff
3034
args: [--fix, --exit-non-zero-on-fix]

mkdocs.yml

+9
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ theme:
2626
- navigation.tabs
2727
- navigation.path
2828
- navigation.top
29+
<<<<<<<
30+
=======
31+
python:
32+
rendering:
33+
show_submodules: no
34+
35+
watch:
36+
- src/datachain
37+
>>>>>>>
2938
- navigation.prune
3039
- navigation.footer
3140
- toc.follow

pyproject.toml

+11
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@ dependencies = [
5151

5252
[project.optional-dependencies]
5353
docs = [
54+
<<<<<<<
55+
=======
56+
"mkdocs==1.6.1",
57+
"mkdocs-gen-files==0.5.0",
58+
"mkdocs-material==9.5.36",
59+
"mkdocs-section-index==0.3.9",
60+
"mkdocstrings-python==1.11.1"
61+
]
62+
tests = [
63+
"pytest==7.2.0",
64+
>>>>>>>
5465
"mkdocs>=1.5.2",
5566
"mkdocs-gen-files>=0.5.0",
5667
"mkdocs-material>=9.3.1",

0 commit comments

Comments
 (0)