Skip to content

Commit 0d9898d

Browse files
committed
Merge main and resolve conflicts
- Update ipykernel version constraint to >=6.29.5,<8.0.0 (from main) - Keep UV/PEP 621 format in pyproject.toml - Remove poetry.lock (using uv.lock instead) - Update uv.lock with new dependency constraints
2 parents 1aa70c6 + 8403027 commit 0d9898d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dev = [
4545
"sphinx-rtd-theme>=2.0.0,<3.0.0",
4646
"pandas>=2.2.2,<3.0.0",
4747
"jupyter>=1.0.0,<2.0.0",
48-
"ipykernel>=6.29.5,<7.0.0",
48+
"ipykernel>=6.29.5,<8.0.0",
4949
]
5050

5151
[project.urls]

uv.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)