Skip to content

Commit eeac681

Browse files
Unify requirements files (#3989)
1 parent c87060a commit eeac681

File tree

13 files changed

+59
-65
lines changed

13 files changed

+59
-65
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --extra=docs --extra=test --no-annotate --output-file=.config/requirements.txt --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml
5+
# pip-compile --all-extras --no-annotate --output-file=.config/constraints.txt --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml
66
#
77
ansible-compat==4.1.11
88
ansible-core==2.16.2

.config/lock-requirements.txt

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

.config/requirements-lock.txt

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

.config/requirements-lock.txt

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#
2+
# This file is autogenerated by pip-compile with Python 3.10
3+
# by the following command:
4+
#
5+
# pip-compile --no-annotate --output-file=.config/requirements-lock.txt --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml
6+
#
7+
ansible-compat==4.1.11
8+
ansible-core==2.16.2
9+
attrs==23.2.0
10+
black==23.12.1
11+
bracex==2.4
12+
cffi==1.16.0
13+
click==8.1.7
14+
cryptography==41.0.7
15+
filelock==3.13.1
16+
jinja2==3.1.3
17+
jsonschema==4.21.0
18+
jsonschema-specifications==2023.12.1
19+
markdown-it-py==3.0.0
20+
markupsafe==2.1.3
21+
mdurl==0.1.2
22+
mypy-extensions==1.0.0
23+
packaging==23.2
24+
pathspec==0.12.1
25+
platformdirs==4.1.0
26+
pycparser==2.21
27+
pygments==2.17.2
28+
pyyaml==6.0.1
29+
referencing==0.32.1
30+
rich==13.7.0
31+
rpds-py==0.17.1
32+
ruamel-yaml==0.18.5
33+
subprocess-tee==0.4.1
34+
tomli==2.0.1
35+
typing-extensions==4.9.0
36+
wcmatch==8.5
37+
yamllint==1.33.0
38+
39+
# The following packages are considered to be unsafe in a requirements file:
40+
# resolvelib
41+
# ruamel-yaml-clib

.pre-commit-config.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ ci:
1414
submodules: true
1515
exclude: >
1616
(?x)^(
17+
.config/constraints.txt|
1718
.config/.*requirements.*|
1819
.vscode/extensions.json|
1920
.vscode/settings.json|
@@ -64,9 +65,9 @@ repos:
6465
)$
6566
always_run: true
6667
additional_dependencies:
67-
- prettier
68-
- prettier-plugin-toml
69-
- prettier-plugin-sort-json
68+
- prettier@3.2.4
69+
- prettier-plugin-toml@2.0.1
70+
- prettier-plugin-sort-json@3.1.0
7071
- repo: https://github.com/streetsidesoftware/cspell-cli
7172
rev: v8.3.0
7273
hooks:
@@ -135,7 +136,7 @@ repos:
135136
types: [file, yaml]
136137
entry: yamllint --strict
137138
- repo: https://github.com/astral-sh/ruff-pre-commit
138-
rev: "v0.1.11"
139+
rev: "v0.1.13"
139140
hooks:
140141
- id: ruff
141142
args: [--fix, --exit-non-zero-on-fix]
@@ -204,7 +205,7 @@ repos:
204205
name: lock
205206
alias: lock
206207
always_run: true
207-
entry: pip-compile --upgrade -q --no-annotate --output-file=.config/lock-requirements.txt pyproject.toml --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib
208+
entry: pip-compile --upgrade -q --no-annotate --output-file=.config/requirements-lock.txt pyproject.toml --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib
208209
files: ^.config\/.*requirements.*$
209210
language: python
210211
language_version: "3.10" # minimal we support officially
@@ -216,15 +217,15 @@ repos:
216217
name: deps
217218
alias: deps
218219
always_run: true
219-
entry: pip-compile -q --no-annotate --output-file=.config/requirements.txt pyproject.toml --extra docs --extra test --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib
220+
entry: pip-compile -q --no-annotate --output-file=.config/constraints.txt pyproject.toml --all-extras --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib
220221
files: ^.config\/.*requirements.*$
221222
language: python
222223
language_version: "3.10" # minimal we support officially
223224
pass_filenames: false
224225
additional_dependencies:
225226
- pip>=22.3.1
226227
- id: pip-compile
227-
entry: pip-compile -q --no-annotate --output-file=.config/requirements.txt pyproject.toml --extra docs --extra test --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib --upgrade
228+
entry: pip-compile -q --no-annotate --output-file=.config/constraints.txt pyproject.toml --all-extras --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib --upgrade
228229
language: python
229230
always_run: true
230231
pass_filenames: false

cspell.config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dictionaries:
1212
ignorePaths:
1313
- cspell.config.yaml
1414
# The requirements file
15-
- .config/requirements.txt
15+
- .config/constraints.txt
1616
- docs/requirements.txt
1717
- docs/requirements.in
1818
# Test fixtures generated from outside

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,9 @@ max-complexity = 20
279279
]
280280

281281
[tool.setuptools.dynamic]
282-
dependencies = {file = [".config/runtime-requirements.txt"]}
283-
optional-dependencies.docs = {file = [".config/docs-requirements.txt"]}
284-
optional-dependencies.test = {file = [".config/test-requirements.txt"]}
285-
optional-dependencies.lock = {file = [".config/lock-requirements.txt"]}
282+
dependencies = {file = [".config/requirements.in"]}
283+
optional-dependencies.docs = {file = [".config/requirements-docs.in"]}
284+
optional-dependencies.test = {file = [".config/requirements-test.in"]}
286285

287286
[tool.setuptools_scm]
288287
local_scheme = "no-local-version"

0 commit comments

Comments
 (0)