Skip to content

Commit 4ee64d6

Browse files
committed
Rebased new core onto master after 2 PRs (lint + release)
2 parents 34081cb + 18af5d8 commit 4ee64d6

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

.gitignore

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,6 @@ target/
156156

157157
# Jupyter Notebook
158158
.ipynb_checkpoints
159-
<<<<<<< HEAD
160-
<<<<<<< HEAD
161-
=======
162-
>>>>>>> 9359e8d ((after rebase) updated gitignore and moved linting to new branch)
163159

164160
# IPython
165161
profile_default/
@@ -168,7 +164,7 @@ ipython_config.py
168164
# pyenv
169165
# For a library or package, you might want to ignore these files since the code is
170166
# intended to run in multiple environments; otherwise, check them in:
171-
# .python-version
167+
# # .python-version
172168

173169
# pipenv
174170
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
@@ -295,17 +291,7 @@ __marimo__/
295291
# json files for storing production records
296292
*.json
297293
.env
298-
<<<<<<< HEAD
299-
<<<<<<< HEAD
300-
/json_pages
301-
/notebooks
302-
/test_json_pages
303-
=======
304-
/json_pages
305-
>>>>>>> 9359e8d ((after rebase) updated gitignore and moved linting to new branch)
306-
=======
307-
/json_pages
308294

309-
/test_json_pages
295+
/json_pages
310296
/notebooks
311-
>>>>>>> 5830467 (Remove accidentally committed files)
297+
/test_json_pages

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ maintainers = [
1515
requires-python = ">=3.11"
1616
dependencies = [
1717
"elinkapi>=0.4.9",
18+
"pre-commit>=4.2.0",
1819
"pydantic>=2.11.7",
1920
"pymongo>=4.13.2",
2021
]

uv.lock

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)