From bcbc31646330b582ca2f34cc331085d8a8c1d32c Mon Sep 17 00:00:00 2001
From: mandlinsarah <158019541+mandlinsarah@users.noreply.github.com>
Date: Thu, 12 Dec 2024 02:39:02 +0000
Subject: [PATCH] update template

---
 .cruft.json             |  2 +-
 .pre-commit-config.yaml |  4 ++++
 mkdocs.yml              |  9 +++++++++
 pyproject.toml          | 11 +++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/.cruft.json b/.cruft.json
index 7c6259e7b..665286607 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/iterative/py-template",
-  "commit": "867297aa15a0deaf5302edd01a2bc7ab87039627",
+  "commit": "8a54615e5817c76bd1084623a4be0c4deb3ecb7e",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 710658b7f..6674ed40b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -24,7 +24,11 @@ repos:
       - id: trailing-whitespace
         exclude: '^LICENSES/'
   - repo: https://github.com/astral-sh/ruff-pre-commit
+<<<<<<<
     rev: 'v0.6.2'
+=======
+    rev: 'v0.6.8'
+>>>>>>>
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
diff --git a/mkdocs.yml b/mkdocs.yml
index 0b48e0cd8..6988618d8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -26,6 +26,15 @@ theme:
     - navigation.tabs
     - navigation.path
     - navigation.top
+<<<<<<<
+=======
+        python:
+          rendering:
+            show_submodules: no
+
+watch:
+  - src/datachain
+>>>>>>>
     - navigation.prune
     - navigation.footer
     - toc.follow
diff --git a/pyproject.toml b/pyproject.toml
index 7b77663f4..96ad0c6f0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,6 +51,17 @@ dependencies = [
 
 [project.optional-dependencies]
 docs = [
+<<<<<<<
+=======
+  "mkdocs==1.6.1",
+  "mkdocs-gen-files==0.5.0",
+  "mkdocs-material==9.5.36",
+  "mkdocs-section-index==0.3.9",
+  "mkdocstrings-python==1.11.1"
+]
+tests = [
+  "pytest==7.2.0",
+>>>>>>>
   "mkdocs>=1.5.2",
   "mkdocs-gen-files>=0.5.0",
   "mkdocs-material>=9.3.1",