Skip to content

Commit c56b8f9

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

File tree

4 files changed

+28
-1
lines changed

4 files changed

+28
-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": "8a54615e5817c76bd1084623a4be0c4deb3ecb7e",
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

+14
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,27 @@ dependencies = [
4444
"jmespath>=1.0",
4545
"datamodel-code-generator>=0.25",
4646
"Pillow>=10.0.0,<11",
47+
<<<<<<<
4748
"msgpack>=1.0.4,<2",
4849
"psutil",
4950
"huggingface_hub"
5051
]
5152

5253
[project.optional-dependencies]
5354
docs = [
55+
=======
56+
57+
[project.optional-dependencies]
58+
docs = [
59+
"mkdocs==1.6.1",
60+
"mkdocs-gen-files==0.5.0",
61+
"mkdocs-material==9.5.36",
62+
"mkdocs-section-index==0.3.9",
63+
"mkdocstrings-python==1.11.1"
64+
]
65+
tests = [
66+
"pytest==7.2.0",
67+
>>>>>>>
5468
"mkdocs>=1.5.2",
5569
"mkdocs-gen-files>=0.5.0",
5670
"mkdocs-material>=9.3.1",

0 commit comments

Comments
 (0)