Skip to content

Commit 92723dc

Browse files
Copilotdannywillems
andcommitted
fix: resolve conflicts with main branch (ruff/isort dependency updates)
Co-authored-by: dannywillems <6018454+dannywillems@users.noreply.github.com>
1 parent ac61419 commit 92723dc

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ and this project adheres to
1111
### Infrastructure
1212

1313
- CI: bump actions/checkout from 4 to 6 ([6c9eecd], [#49])
14+
- Bump ruff dev dependency from `^0.14.14` to `>=0.14.14,<0.16.0` ([ac8a1db], [#50])
15+
- Bump isort dev dependency from `^7.0.0` to `>=7,<9` to allow isort 8.x
16+
([4464bfd], [#51])
1417
- Migrate from Poetry to uv: update `pyproject.toml` to PEP 621 format with
1518
`hatchling` build backend, replace `poetry run` with `uv run` in Makefile,
1619
and switch CI to `astral-sh/setup-uv` ([5f4fc51], [#56])
@@ -162,6 +165,8 @@ and this project adheres to
162165

163166
[6c9eecd]: https://github.com/LeakIX/l9format-python/commit/6c9eecd
164167
[5f4fc51]: https://github.com/LeakIX/l9format-python/commit/5f4fc51
168+
[ac8a1db]: https://github.com/LeakIX/l9format-python/commit/ac8a1db
169+
[4464bfd]: https://github.com/LeakIX/l9format-python/commit/4464bfd
165170
[ac4744e]: https://github.com/LeakIX/l9format-python/commit/ac4744e
166171
[d554f1e]: https://github.com/LeakIX/l9format-python/commit/d554f1e
167172
[7f49ff5]: https://github.com/LeakIX/l9format-python/commit/7f49ff5
@@ -246,5 +251,7 @@ and this project adheres to
246251
[#31]: https://github.com/LeakIX/l9format-python/issues/31
247252
[#32]: https://github.com/LeakIX/l9format-python/issues/32
248253
[#49]: https://github.com/LeakIX/l9format-python/pull/49
254+
[#50]: https://github.com/LeakIX/l9format-python/pull/50
255+
[#51]: https://github.com/LeakIX/l9format-python/pull/51
249256
[#56]: https://github.com/LeakIX/l9format-python/pull/56
250257
[#43]: https://github.com/LeakIX/l9format-python/issues/43

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Documentation = "https://github.com/leakix/l9format-python"
2121
dev = [
2222
"black>=26.1.0",
2323
"fire>=0.7.1",
24-
"isort>=7.0.0",
24+
"isort>=7,<9",
2525
"mypy>=1.19.0",
2626
"pip-audit>=2.10.0",
2727
"pytest>=9.0.2",
28-
"ruff>=0.14.14",
28+
"ruff>=0.14.14,<0.16.0",
2929
]
3030

3131
[build-system]

0 commit comments

Comments
 (0)