Skip to content

Fix CI build failures by updating requirement file references #69177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dwoz wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix CI build failures by updating requirement file references #69177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9a6e6a
Fix CI build failures by updating requirement file references
May 15, 2026
4d7c540
Fix changelog and pkg build tools by updating requirement extensions
May 16, 2026
299239d
Fix final .txt requirement references in docs and CI actions
May 16, 2026
7912e2d
Fix platform-specific requirement paths in noxfile.py
May 16, 2026
0a6a8bb
Update workflow templates and regenerate workflows
May 16, 2026
8782fd6
Update lockfile internal comments to correctly reference constraints.txt
May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build-onedir-deps/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ runs:
run: |
HASH=$(python3 .github/scripts/hash-files.py \
'.relenv/**/*.xz' \
'requirements/static/pkg/*/*.txt' \
'requirements/static/pkg/*/*.lock' \
'tools/pkg/build.py' \
'.github/actions/build-onedir-deps/action.yml' \
'.github/workflows/build-deps-onedir-*.yml' \
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-python-tools-scripts/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ runs:
id: venv-hash
shell: bash
run: |
FILES_HASH=$(python3 .github/scripts/hash-files.py 'requirements/**/*.txt' 'tools/**/*.py')
FILES_HASH=$(python3 .github/scripts/hash-files.py 'requirements/**/*.in' 'requirements/**/*.lock' 'tools/**/*.py')
VENV_NAME_HASH=$(echo "${{ inputs.cache-prefix }}|${{ github.workflow }}|${{
steps.get-python-version.outputs.version-sha256sum }}|${FILES_HASH}" | sha256sum | cut -d ' ' -f 1)
echo "TOOLS_VIRTUALENV_CACHE_SEED=$VENV_NAME_HASH" | tee -a "${GITHUB_ENV}"
Expand Down
6 changes: 3 additions & 3 deletions .github/scripts/hash-files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
python hash-files.py 'pattern1' 'pattern2' ...

Example:
python hash-files.py 'requirements/**/*.txt' 'noxfile.py'
python hash-files.py 'requirements/**/*' 'noxfile.py'
"""
import hashlib
import sys
Expand All @@ -21,7 +21,7 @@ def find_files(patterns):
Find all files matching the given glob patterns.

Args:
patterns: List of glob patterns (e.g., 'requirements/**/*.txt')
patterns: List of glob patterns (e.g., 'requirements/**/*')

Returns:
Sorted list of Path objects for matching files
Expand Down Expand Up @@ -122,7 +122,7 @@ def main():
print("Usage: python hash-files.py 'pattern1' 'pattern2' ...", file=sys.stderr)
print("", file=sys.stderr)
print(
"Example: python hash-files.py 'requirements/**/*.txt' 'noxfile.py'",
"Example: python hash-files.py 'requirements/**/*' 'noxfile.py'",
file=sys.stderr,
)
sys.exit(1)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-deps-ci-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
- name: PyPi Proxy
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
run: |
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.txt
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.lock

- name: Setup Python Tools Scripts
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,13 @@ jobs:
- requirements/static/ci/py3.*/lint.lock
pkg_requirements:
- added|modified: &pkg_requirements
- requirements/static/pkg/py3.*/darwin.in
- requirements/static/pkg/py3.*/linux.txt
- requirements/static/pkg/py3.*/freebsd.txt
- requirements/static/pkg/py3.*/windows.in
- requirements/static/pkg/*.in
- requirements/static/pkg/py3.*/*.in
- requirements/static/pkg/py3.*/*.lock
test_requirements:
- added|modified: &test_requirements
- requirements/static/ci/py3.*/darwin.in
- requirements/static/ci/py3.*/linux.txt
- requirements/static/ci/py3.*/freebsd.txt
- requirements/static/ci/py3.*/windows.in
- requirements/static/ci/py3.*/darwin-crypto.in
- requirements/static/ci/py3.*/linux-crypto.in
- requirements/static/ci/py3.*/freebsd-crypto.in
- requirements/static/ci/py3.*/windows-crypto.in
- requirements/static/ci/*.in
- requirements/static/ci/py3.*/*.lock
deleted:
- deleted:
- '**'
Expand Down Expand Up @@ -176,7 +169,7 @@ jobs:
shell: bash
run: |
HASH=$(python3 .github/scripts/hash-files.py \
'requirements/**/*.txt' \
'requirements/**/*' \
'cicd/golden-images.json' \
'noxfile.py' \
'pkg/common/env-cleanup-rules.yml' \
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/depcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ jobs:
pkg_requirements:
- added|modified: &pkg_requirements
- requirements/static/pkg/py3.*/darwin.in
- requirements/static/pkg/py3.*/linux.txt
- requirements/static/pkg/py3.*/freebsd.txt
- requirements/static/pkg/py3.*/linux.lock
- requirements/static/pkg/py3.*/freebsd.lock
- requirements/static/pkg/py3.*/windows.in
test_requirements:
- added|modified: &test_requirements
- requirements/static/ci/py3.*/darwin.in
- requirements/static/ci/py3.*/linux.txt
- requirements/static/ci/py3.*/freebsd.txt
- requirements/static/ci/py3.*/linux.lock
- requirements/static/ci/py3.*/freebsd.lock
- requirements/static/ci/py3.*/windows.in
- requirements/static/ci/py3.*/darwin-crypto.in
- requirements/static/ci/py3.*/linux-crypto.in
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
shell: bash
run: |
HASH=$(python3 .github/scripts/hash-files.py \
'requirements/**/*.txt' \
'requirements/**/*' \
'cicd/golden-images.json' \
'noxfile.py' \
'pkg/common/env-cleanup-rules.yml' \
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,13 @@ jobs:
- requirements/static/ci/py3.*/lint.lock
pkg_requirements:
- added|modified: &pkg_requirements
- requirements/static/pkg/py3.*/darwin.in
- requirements/static/pkg/py3.*/linux.txt
- requirements/static/pkg/py3.*/freebsd.txt
- requirements/static/pkg/py3.*/windows.in
- requirements/static/pkg/*.in
- requirements/static/pkg/py3.*/*.in
- requirements/static/pkg/py3.*/*.lock
test_requirements:
- added|modified: &test_requirements
- requirements/static/ci/py3.*/darwin.in
- requirements/static/ci/py3.*/linux.txt
- requirements/static/ci/py3.*/freebsd.txt
- requirements/static/ci/py3.*/windows.in
- requirements/static/ci/py3.*/darwin-crypto.in
- requirements/static/ci/py3.*/linux-crypto.in
- requirements/static/ci/py3.*/freebsd-crypto.in
- requirements/static/ci/py3.*/windows-crypto.in
- requirements/static/ci/*.in
- requirements/static/ci/py3.*/*.lock
deleted:
- deleted:
- '**'
Expand Down Expand Up @@ -170,7 +163,7 @@ jobs:
shell: bash
run: |
HASH=$(python3 .github/scripts/hash-files.py \
'requirements/**/*.txt' \
'requirements/**/*' \
'cicd/golden-images.json' \
'noxfile.py' \
'pkg/common/env-cleanup-rules.yml' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
shell: bash
run: |
HASH=$(python3 .github/scripts/hash-files.py \
'requirements/**/*.txt' \
'requirements/**/*' \
'cicd/golden-images.json' \
'noxfile.py' \
'pkg/common/env-cleanup-rules.yml' \
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,20 +131,13 @@ jobs:
- requirements/static/ci/py3.*/lint.lock
pkg_requirements:
- added|modified: &pkg_requirements
- requirements/static/pkg/py3.*/darwin.in
- requirements/static/pkg/py3.*/linux.txt
- requirements/static/pkg/py3.*/freebsd.txt
- requirements/static/pkg/py3.*/windows.in
- requirements/static/pkg/*.in
- requirements/static/pkg/py3.*/*.in
- requirements/static/pkg/py3.*/*.lock
test_requirements:
- added|modified: &test_requirements
- requirements/static/ci/py3.*/darwin.in
- requirements/static/ci/py3.*/linux.txt
- requirements/static/ci/py3.*/freebsd.txt
- requirements/static/ci/py3.*/windows.in
- requirements/static/ci/py3.*/darwin-crypto.in
- requirements/static/ci/py3.*/linux-crypto.in
- requirements/static/ci/py3.*/freebsd-crypto.in
- requirements/static/ci/py3.*/windows-crypto.in
- requirements/static/ci/*.in
- requirements/static/ci/py3.*/*.lock
deleted:
- deleted:
- '**'
Expand Down Expand Up @@ -224,7 +217,7 @@ jobs:
shell: bash
run: |
HASH=$(python3 .github/scripts/hash-files.py \
'requirements/**/*.txt' \
'requirements/**/*' \
'cicd/golden-images.json' \
'noxfile.py' \
'pkg/common/env-cleanup-rules.yml' \
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,20 +104,13 @@ jobs:
- requirements/static/ci/py3.*/lint.lock
pkg_requirements:
- added|modified: &pkg_requirements
- requirements/static/pkg/py3.*/darwin.in
- requirements/static/pkg/py3.*/linux.txt
- requirements/static/pkg/py3.*/freebsd.txt
- requirements/static/pkg/py3.*/windows.in
- requirements/static/pkg/*.in
- requirements/static/pkg/py3.*/*.in
- requirements/static/pkg/py3.*/*.lock
test_requirements:
- added|modified: &test_requirements
- requirements/static/ci/py3.*/darwin.in
- requirements/static/ci/py3.*/linux.txt
- requirements/static/ci/py3.*/freebsd.txt
- requirements/static/ci/py3.*/windows.in
- requirements/static/ci/py3.*/darwin-crypto.in
- requirements/static/ci/py3.*/linux-crypto.in
- requirements/static/ci/py3.*/freebsd-crypto.in
- requirements/static/ci/py3.*/windows-crypto.in
- requirements/static/ci/*.in
- requirements/static/ci/py3.*/*.lock
deleted:
- deleted:
- '**'
Expand Down Expand Up @@ -197,7 +190,7 @@ jobs:
shell: bash
run: |
HASH=$(python3 .github/scripts/hash-files.py \
'requirements/**/*.txt' \
'requirements/**/*' \
'cicd/golden-images.json' \
'noxfile.py' \
'pkg/common/env-cleanup-rules.yml' \
Expand Down
19 changes: 6 additions & 13 deletions .github/workflows/templates/layout.yml.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,20 +131,13 @@ jobs:
- requirements/static/ci/py3.*/lint.lock
pkg_requirements:
- added|modified: &pkg_requirements
- requirements/static/pkg/py3.*/darwin.in
- requirements/static/pkg/py3.*/linux.txt
- requirements/static/pkg/py3.*/freebsd.txt
- requirements/static/pkg/py3.*/windows.in
- requirements/static/pkg/*.in
- requirements/static/pkg/py3.*/*.in
- requirements/static/pkg/py3.*/*.lock
test_requirements:
- added|modified: &test_requirements
- requirements/static/ci/py3.*/darwin.in
- requirements/static/ci/py3.*/linux.txt
- requirements/static/ci/py3.*/freebsd.txt
- requirements/static/ci/py3.*/windows.in
- requirements/static/ci/py3.*/darwin-crypto.in
- requirements/static/ci/py3.*/linux-crypto.in
- requirements/static/ci/py3.*/freebsd-crypto.in
- requirements/static/ci/py3.*/windows-crypto.in
- requirements/static/ci/*.in
- requirements/static/ci/py3.*/*.lock
deleted:
- deleted:
- '**'
Expand Down Expand Up @@ -224,7 +217,7 @@ jobs:
shell: bash
run: |
HASH=$(python3 .github/scripts/hash-files.py \
'requirements/**/*.txt' \
'requirements/**/*' \
'cicd/golden-images.json' \
'noxfile.py' \
'pkg/common/env-cleanup-rules.yml' \
Expand Down
4 changes: 2 additions & 2 deletions doc/topics/packaging/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ How to build rpm packages

.. code-block:: bash

pip install -r requirements/static/ci/py{python_version}/changelog.txt
pip install -r requirements/static/ci/py{python_version}/changelog.lock

#. (Optional) To build a specific Salt version, run tools and set Salt version:

Expand Down Expand Up @@ -124,7 +124,7 @@ How to build deb packages

.. code-block:: bash

pip install -r requirements/static/ci/py{python_version}/changelog.txt
pip install -r requirements/static/ci/py{python_version}/changelog.lock

#. (Optional) To build a specific Salt version, run tools and set Salt version:

Expand Down
26 changes: 13 additions & 13 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,51 +200,51 @@ def _get_pip_requirements_file(session, crypto=None, requirements_type="ci"):
if IS_WINDOWS:
if crypto is None:
_requirements_file = os.path.join(
"requirements", "static", requirements_type, pydir, "windows.in"
"requirements", "static", requirements_type, pydir, "windows.lock"
)
if os.path.exists(_requirements_file):
return _requirements_file
_requirements_file = os.path.join(
"requirements", "static", requirements_type, pydir, "windows-crypto.in"
"requirements", "static", requirements_type, pydir, "windows-crypto.lock"
)
if os.path.exists(_requirements_file):
return _requirements_file
session.error(f"Could not find a windows requirements file for {pydir}")
elif IS_DARWIN:
if crypto is None:
_requirements_file = os.path.join(
"requirements", "static", requirements_type, pydir, "darwin.in"
"requirements", "static", requirements_type, pydir, "darwin.lock"
)
if os.path.exists(_requirements_file):
return _requirements_file
_requirements_file = os.path.join(
"requirements", "static", requirements_type, pydir, "darwin-crypto.in"
"requirements", "static", requirements_type, pydir, "darwin-crypto.lock"
)
if os.path.exists(_requirements_file):
return _requirements_file
session.error(f"Could not find a darwin requirements file for {pydir}")
elif IS_FREEBSD:
if crypto is None:
_requirements_file = os.path.join(
"requirements", "static", requirements_type, pydir, "freebsd.txt"
"requirements", "static", requirements_type, pydir, "freebsd.lock"
)
if os.path.exists(_requirements_file):
return _requirements_file
_requirements_file = os.path.join(
"requirements", "static", requirements_type, pydir, "freebsd-crypto.in"
"requirements", "static", requirements_type, pydir, "freebsd-crypto.lock"
)
if os.path.exists(_requirements_file):
return _requirements_file
session.error(f"Could not find a freebsd requirements file for {pydir}")
else:
if crypto is None:
_requirements_file = os.path.join(
"requirements", "static", requirements_type, pydir, "linux.txt"
"requirements", "static", requirements_type, pydir, "linux.lock"
)
if os.path.exists(_requirements_file):
return _requirements_file
_requirements_file = os.path.join(
"requirements", "static", requirements_type, pydir, "linux-crypto.in"
"requirements", "static", requirements_type, pydir, "linux-crypto.lock"
)
if os.path.exists(_requirements_file):
return _requirements_file
Expand Down Expand Up @@ -933,10 +933,10 @@ def test_cloud(session, coverage):
# Install requirements
if _upgrade_pip_setuptools_and_wheel(session):
linux_requirements_file = os.path.join(
"requirements", "static", "ci", pydir, "linux.txt"
"requirements", "static", "ci", pydir, "linux.lock"
)
cloud_requirements_file = os.path.join(
"requirements", "static", "ci", pydir, "cloud.txt"
"requirements", "static", "ci", pydir, "cloud.lock"
)

install_command = [
Expand Down Expand Up @@ -1542,7 +1542,7 @@ def fileno(self):
def _lint(session, rcfile, flags, paths, upgrade_setuptools_and_pip=True):
if _upgrade_pip_setuptools_and_wheel(session, upgrade=upgrade_setuptools_and_pip):
linux_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "linux.txt"
"requirements", "static", "ci", _get_pydir(session), "linux.lock"
)
lint_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "lint.lock"
Expand Down Expand Up @@ -1684,7 +1684,7 @@ def docs_html(session, compress, clean):
"""
if _upgrade_pip_setuptools_and_wheel(session):
linux_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "linux.txt"
"requirements", "static", "ci", _get_pydir(session), "linux.lock"
)
base_requirements_file = os.path.join("requirements", "base.in")
zeromq_requirements_file = os.path.join("requirements", "zeromq.in")
Expand Down Expand Up @@ -1722,7 +1722,7 @@ def docs_man(session, compress, update, clean):
"""
if _upgrade_pip_setuptools_and_wheel(session):
linux_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "linux.txt"
"requirements", "static", "ci", _get_pydir(session), "linux.lock"
)
base_requirements_file = os.path.join("requirements", "base.in")
zeromq_requirements_file = os.path.join("requirements", "zeromq.in")
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/changelog.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile requirements/static/ci/changelog.in --python-platform=linux --python-version=3.10 --constraint requirements/constraints.txt --no-emit-index-url --unsafe-package=setuptools -c=requirements/static/ci/py3.10/linux.txt -o=requirements/static/ci/py3.10/changelog.lock
# uv pip compile requirements/static/ci/changelog.in --python-platform=linux --python-version=3.10 --constraint requirements/constraints.txt --no-emit-index-url --unsafe-package=setuptools -c=requirements/static/ci/py3.10/linux.lock -o=requirements/static/ci/py3.10/changelog.lock
click==8.1.3
# via
# click-default-group
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/cloud.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was autogenerated by uv via the following command:
# uv pip compile requirements/base.in requirements/pytest.in requirements/zeromq.in requirements/static/ci/common.in requirements/static/ci/cloud.in requirements/static/pkg/linux.in --python-platform=linux --python-version=3.10 --constraint requirements/constraints.txt --no-emit-index-url --unsafe-package=setuptools -c=requirements/static/ci/py3.10/linux.txt -c=requirements/static/pkg/py3.10/linux.txt -o=requirements/static/ci/py3.10/cloud.lock
# uv pip compile requirements/base.in requirements/pytest.in requirements/zeromq.in requirements/static/ci/common.in requirements/static/ci/cloud.in requirements/static/pkg/linux.in --python-platform=linux --python-version=3.10 --constraint requirements/constraints.txt --no-emit-index-url --unsafe-package=setuptools -c=requirements/static/ci/py3.10/linux.lock -c=requirements/static/pkg/py3.10/linux.lock -o=requirements/static/ci/py3.10/cloud.lock
aiohappyeyeballs==2.6.1
# via
# -c requirements/static/ci/py3.10/linux.lock
Expand Down
Loading
Loading