From 0fa03bc824d4897161baf5c1dc9743a5e09aebdf Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Wed, 21 Aug 2024 00:46:40 +0200 Subject: [PATCH] Wire extra lock files --- .github/workflows/pip-tools.yml | 30 ++++++++++++++++++++ requirements/tox-metadata-validation.in | 2 ++ requirements/tox-pip-compile-build-lock.in | 1 + requirements/tox-pip-compile-tox-env-lock.in | 1 + requirements/tox-pre-commit.in | 1 + tox.ini | 7 ++--- 6 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 requirements/tox-metadata-validation.in create mode 120000 requirements/tox-pip-compile-build-lock.in create mode 120000 requirements/tox-pip-compile-tox-env-lock.in create mode 100644 requirements/tox-pre-commit.in diff --git a/.github/workflows/pip-tools.yml b/.github/workflows/pip-tools.yml index 454f7745b1..f14ff3f549 100644 --- a/.github/workflows/pip-tools.yml +++ b/.github/workflows/pip-tools.yml @@ -86,13 +86,43 @@ jobs: - macos-13 - windows-2019 lock-file-env: + - build-dists + - build-docs + - linkcheck-docs + - metadata-validation + - pip-compile + - pip-compile-build-lock + - pip-compile-tox-env-lock + - pre-commit - py - tox + - spellcheck-docs lock-file-extra-input: - pyproject.toml + - '' exclude: + - lock-file-env: build-dists + lock-file-extra-input: pyproject.toml + - lock-file-env: build-docs + lock-file-extra-input: '' + - lock-file-env: linkcheck-docs + lock-file-extra-input: '' + - lock-file-env: metadata-validation + lock-file-extra-input: pyproject.toml + - lock-file-env: pip-compile + lock-file-extra-input: pyproject.toml + - lock-file-env: pip-compile-build-lock + lock-file-extra-input: pyproject.toml + - lock-file-env: pip-compile-tox-env-lock + lock-file-extra-input: pyproject.toml + - lock-file-env: pre-commit + lock-file-extra-input: pyproject.toml + - lock-file-env: py + lock-file-extra-input: '' - lock-file-env: tox lock-file-extra-input: pyproject.toml + - lock-file-env: spellcheck-docs + lock-file-extra-input: '' env: TOXENV: pip-compile-tox-env-lock diff --git a/requirements/tox-metadata-validation.in b/requirements/tox-metadata-validation.in new file mode 100644 index 0000000000..f61f701979 --- /dev/null +++ b/requirements/tox-metadata-validation.in @@ -0,0 +1,2 @@ +setuptools-scm +twine diff --git a/requirements/tox-pip-compile-build-lock.in b/requirements/tox-pip-compile-build-lock.in new file mode 120000 index 0000000000..03e5653ad6 --- /dev/null +++ b/requirements/tox-pip-compile-build-lock.in @@ -0,0 +1 @@ +tox-pip-compile.in \ No newline at end of file diff --git a/requirements/tox-pip-compile-tox-env-lock.in b/requirements/tox-pip-compile-tox-env-lock.in new file mode 120000 index 0000000000..03e5653ad6 --- /dev/null +++ b/requirements/tox-pip-compile-tox-env-lock.in @@ -0,0 +1 @@ +tox-pip-compile.in \ No newline at end of file diff --git a/requirements/tox-pre-commit.in b/requirements/tox-pre-commit.in new file mode 100644 index 0000000000..8ff712a026 --- /dev/null +++ b/requirements/tox-pre-commit.in @@ -0,0 +1 @@ +pre-commit >= 2.6.0 diff --git a/tox.ini b/tox.ini index 7fccab1232..425ed73ae3 100644 --- a/tox.ini +++ b/tox.ini @@ -136,9 +136,7 @@ description = have valid metadata depends = build-dists -deps = - setuptools-scm - twine +deps = -rrequirements{/}tox-{envname}.in commands_pre = {envpython} \ {[python-cli-options]byte-errors} \ @@ -216,8 +214,7 @@ commands_post = ); \ print("codecov-flags=MyPy", file=gh_output_fd); \ gh_output_fd.close()' -deps = - pre-commit >= 2.6.0 +deps = -rrequirements{/}tox-{envname}.in isolated_build = true package = skip pass_env =