File tree 4 files changed +28
-1
lines changed
4 files changed +28
-1
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"template" : " https://github.com/iterative/py-template" ,
3
- "commit" : " 867297aa15a0deaf5302edd01a2bc7ab87039627 " ,
3
+ "commit" : " ef90d737474b8723d0791281775a46096ddc9ad9 " ,
4
4
"checkout" : null ,
5
5
"context" : {
6
6
"cookiecutter" : {
Original file line number Diff line number Diff line change @@ -24,7 +24,11 @@ repos:
24
24
- id : trailing-whitespace
25
25
exclude : ' ^LICENSES/'
26
26
- repo : https://github.com/astral-sh/ruff-pre-commit
27
+ <<<<<<<
27
28
rev : ' v0.6.2'
29
+ =======
30
+ rev : ' v0.6.8'
31
+ >>>>>>>
28
32
hooks :
29
33
- id : ruff
30
34
args : [--fix, --exit-non-zero-on-fix]
Original file line number Diff line number Diff line change @@ -26,6 +26,15 @@ theme:
26
26
- navigation.tabs
27
27
- navigation.path
28
28
- navigation.top
29
+ <<<<<<<
30
+ =======
31
+ python :
32
+ rendering :
33
+ show_submodules : no
34
+
35
+ watch :
36
+ - src/datachain
37
+ >>>>>>>
29
38
- navigation.prune
30
39
- navigation.footer
31
40
- toc.follow
Original file line number Diff line number Diff line change @@ -44,13 +44,27 @@ dependencies = [
44
44
" jmespath>=1.0" ,
45
45
" datamodel-code-generator>=0.25" ,
46
46
" Pillow>=10.0.0,<11" ,
47
+ <<<<<<<
47
48
" msgpack>=1.0.4,<2" ,
48
49
" psutil" ,
49
50
" huggingface_hub"
50
51
]
51
52
52
53
[project .optional-dependencies ]
53
54
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
+ >>>>>>>
54
68
"mkdocs>=1.5.2",
55
69
"mkdocs-gen-files>=0.5.0",
56
70
"mkdocs-material>=9.3.1",
You can’t perform that action at this time.
0 commit comments