Skip to content

Commit 1369435

Browse files
committed
fix: adopt uv.lock and dependency-groups
- adds few extra indirect-dependency constraints which were found by uv lower resolver, will solve corner cases issues with pip as a side effect and speedup installation speed with both - replaces development extras with dependency-groups - migrates tox.ini into pyproject.toml Fixes: AAP-52655
1 parent bcbbb62 commit 1369435

17 files changed

+3586
-564
lines changed

.config/constraints.txt

Lines changed: 0 additions & 146 deletions
This file was deleted.

.config/requirements-docs.in

Lines changed: 0 additions & 1 deletion
This file was deleted.

.config/requirements-lock.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

.config/requirements-test.in

Lines changed: 0 additions & 27 deletions
This file was deleted.

.config/requirements.in

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/lower-constraints.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,4 @@ test/local-content
8080
test/schemas/node_modules
8181
node_modules
8282
.direnv
83-
uv.lock
8483
.ansible

.pre-commit-config.yaml

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ ci:
66
autofix_commit_msg: "chore: auto fixes from pre-commit.com hooks"
77
skip:
88
# https://github.com/pre-commit-ci/issues/issues/55
9-
- pip-compile
109
- pyright
1110
- renovate-config-validator # container limits
1211
- schemas
1312
submodules: true
1413
exclude: >
1514
(?x)^(
16-
.config/constraints.txt|
17-
.config/.*requirements.*|
1815
examples/broken/encoding.yml|
1916
examples/broken/encoding.j2|
2017
examples/broken/yaml-with-tabs/invalid-due-tabs.yaml|
@@ -31,8 +28,17 @@ repos:
3128
- repo: meta
3229
hooks:
3330
- id: check-useless-excludes
31+
- repo: https://github.com/astral-sh/uv-pre-commit
32+
rev: 0.8.15
33+
hooks:
34+
- id: uv-sync
35+
- id: uv-lock
36+
name: "deps: upgrade via uv sync --upgrade"
37+
alias: deps
38+
args: ["--upgrade"]
39+
stages: [manual]
3440
- repo: https://github.com/renovatebot/pre-commit-hooks
35-
rev: 41.91.1
41+
rev: 41.97.10
3642
hooks:
3743
- id: renovate-config-validator
3844
alias: renovate
@@ -192,7 +198,7 @@ repos:
192198
- wcmatch
193199
- yamllint>=1.34.0
194200
- repo: https://github.com/RobertCraigie/pyright-python
195-
rev: v1.1.404
201+
rev: v1.1.405
196202
hooks:
197203
- id: pyright
198204
additional_dependencies: *deps
@@ -217,33 +223,3 @@ repos:
217223
pass_filenames: false
218224
always_run: true
219225
# stages: [manual]
220-
- id: deps
221-
name: Upgrade constraints files and requirements
222-
files: ^(pyproject\.toml|.config/.*)$
223-
always_run: true
224-
language: python
225-
entry: python3 -m uv pip compile -q --all-extras --python-version=3.10 --output-file=.config/constraints.txt pyproject.toml --upgrade
226-
pass_filenames: false
227-
stages:
228-
- manual
229-
additional_dependencies:
230-
- uv>=0.6.6
231-
- id: pip-compile
232-
name: Check constraints files and requirements
233-
files: ^(pyproject\.toml|\.config/.*)$
234-
language: python
235-
entry: uv pip compile -q --all-extras --python-version=3.10 --output-file=.config/constraints.txt pyproject.toml
236-
pass_filenames: false
237-
additional_dependencies:
238-
- uv>=0.6.6
239-
- id: lock
240-
name: Update requirements-lock.txt
241-
alias: lock
242-
always_run: true
243-
entry: python3 -m uv pip compile -q --python-version=3.10 --upgrade --output-file=.config/requirements-lock.txt pyproject.toml --strip-extras
244-
files: ^(pyproject\.toml|\.config/.*)$
245-
language: python
246-
pass_filenames: false
247-
stages: [manual]
248-
additional_dependencies:
249-
- uv>=0.6.6

.readthedocs.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ mkdocs:
88
build:
99
os: ubuntu-24.04
1010
tools:
11-
python: "3.11"
11+
python: "3.13"
1212
commands:
13-
- pip install --user tox
14-
- python3 -m tox -e docs
15-
python:
16-
install:
17-
- method: pip
18-
path: tox
19-
- method: pip
20-
path: .
21-
extra_requirements:
22-
- docs
13+
- curl https://mise.run | sh
14+
- ~/.local/bin/mise settings experimental=true
15+
- ~/.local/bin/mise settings python.compile=false
16+
- ~/.local/bin/mise settings python.uv_venv_auto=true
17+
- ~/.local/bin/mise trust
18+
- ~/.local/bin/mise install
19+
- PATH=~/.local/share/mise/shims:$PATH ~/.local/bin/mise doctor || true
20+
- PATH=~/.local/share/mise/shims:$PATH ~/.local/bin/mise exec --command "python3 -m pip install tox"
21+
- PATH=~/.local/share/mise/shims:$PATH ~/.local/bin/mise exec --command "python3 -m tox -e docs"
2322
submodules:
2423
include: all
2524
recursive: true

.vscode/extensions.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
"redhat.vscode-yaml",
1414
"ryanluker.vscode-coverage-gutters",
1515
"shardulm94.trailing-spaces",
16-
"tamasfe.even-better-toml",
16+
"tombi-toml.tombi",
1717
"timonwong.shellcheck",
1818
"znck.grammarly"
19-
]
19+
],
20+
"unwantedRecommendations": ["tamasfe.even-better-toml"]
2021
}

0 commit comments

Comments
 (0)