diff --git a/.copier-answers.yml b/.copier-answers.yml index db48cd27..65ba1ce6 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,6 +1,6 @@ # Autogenerated. Do not edit this by hand, use `copier update`. --- -_commit: 0.7.4 +_commit: 0.7.5 _src_path: https://github.com/lkubb/salt-extension-copier author: EITR Technologies, LLC author_email: devops@eitr.tech diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7680ffa9..1f0ecc24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: news-fragments-available: ${{ steps.check-available.outputs.available }} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Check if news fragments are available id: check-available @@ -150,7 +150,7 @@ jobs: steps: - name: Download Exit Status Files if: always() - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: path: exitstatus pattern: exitstatus-* diff --git a/.github/workflows/deploy-docs-action.yml b/.github/workflows/deploy-docs-action.yml index afa62ae5..646863f8 100644 --- a/.github/workflows/deploy-docs-action.yml +++ b/.github/workflows/deploy-docs-action.yml @@ -39,13 +39,13 @@ jobs: steps: - name: Download built docs - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: ${{ inputs.artifact-name }} path: html-docs - name: Upload GitHub Pages artifact - uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3.0.1 + uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0 with: name: html-docs-pages path: html-docs diff --git a/.github/workflows/deploy-package-action.yml b/.github/workflows/deploy-package-action.yml index ba633811..fe8b9ea7 100644 --- a/.github/workflows/deploy-package-action.yml +++ b/.github/workflows/deploy-package-action.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Download Python Package Artifacts - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: salt-extension-${{ inputs.version }}-packages path: dist diff --git a/.github/workflows/docs-action.yml b/.github/workflows/docs-action.yml index d735b011..cfe7d16f 100644 --- a/.github/workflows/docs-action.yml +++ b/.github/workflows/docs-action.yml @@ -10,12 +10,12 @@ jobs: timeout-minutes: 10 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - name: Set up Python 3.10 For Nox - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 with: python-version: "3.10" @@ -24,8 +24,8 @@ jobs: python -m pip install --upgrade pip pip install "nox==$NOX_VERSION" "uv==$UV_VERSION" env: - NOX_VERSION: '2025.2.9' - UV_VERSION: '0.6.15' + NOX_VERSION: '2025.5.1' + UV_VERSION: '0.8.18' - name: Install Doc Requirements run: | diff --git a/.github/workflows/get-changed-files.yml b/.github/workflows/get-changed-files.yml index 8c7a788b..9c8ad878 100644 --- a/.github/workflows/get-changed-files.yml +++ b/.github/workflows/get-changed-files.yml @@ -17,7 +17,7 @@ jobs: changed-files: ${{ toJSON(steps.changed-files.outputs) }} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Get Changed Files id: changed-files diff --git a/.github/workflows/package-action.yml b/.github/workflows/package-action.yml index 9e6a3ae3..16967ac3 100644 --- a/.github/workflows/package-action.yml +++ b/.github/workflows/package-action.yml @@ -14,12 +14,12 @@ jobs: runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 0 - name: Set up Python 3.10 - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 with: python-version: "3.10" diff --git a/.github/workflows/pre-commit-action.yml b/.github/workflows/pre-commit-action.yml index d2bce7f5..cee3aaff 100644 --- a/.github/workflows/pre-commit-action.yml +++ b/.github/workflows/pre-commit-action.yml @@ -14,7 +14,7 @@ jobs: name: Pre-Commit runs-on: ubuntu-24.04 container: - image: 'docker.io/library/python:3.10.17-slim-bookworm@sha256:57038683f4a259e17fcff1ccef7ba30b1065f4b3317dabb5bd7c82640a5ed64f' + image: 'docker.io/library/python:3.10.18-slim-bookworm@sha256:e7eed6c2e7fd1ecc43f0a37da7a115f4c9c9f50f247e9cba086c2f4583412fd9' steps: - name: Install System Deps @@ -23,7 +23,7 @@ jobs: apt-get install -y enchant-2 git gcc make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev git config --global --add safe.directory "$(pwd)" - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Install Pre-Commit run: | diff --git a/.github/workflows/prepare-release-action.yml b/.github/workflows/prepare-release-action.yml index 99a9bce9..bab6a7eb 100644 --- a/.github/workflows/prepare-release-action.yml +++ b/.github/workflows/prepare-release-action.yml @@ -22,10 +22,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Set up Python 3.10 - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 with: python-version: '3.10' diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index d6732871..c62a7634 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Extract tag name id: get_version_tag @@ -41,7 +41,7 @@ jobs: steps: - name: Find Pull Request - uses: juliangruber/find-pull-request-action@2f36c5fe1abfda4745dfab4f38217ebad8ded4eb # v1.9.0 + uses: juliangruber/find-pull-request-action@20b962e58a4abbc0dc63bcc0fde0c997de8782b5 # v1.10.0 id: find-pull-request with: branch: release/auto @@ -82,7 +82,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Extract version of merged release PR id: get_version_pr diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index bae38711..fcc0c037 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -15,17 +15,17 @@ jobs: max-parallel: 3 matrix: include: - - {salt-version: "3006.10", python-version: "3.9"} - - {salt-version: "3006.10", python-version: "3.10"} - - {salt-version: "3007.1", python-version: "3.10"} + - {salt-version: "3006.15", python-version: "3.9"} + - {salt-version: "3006.15", python-version: "3.10"} + - {salt-version: "3007.7", python-version: "3.10"} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 2 # coverage: Issue detecting commit SHA - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 with: python-version: ${{ matrix.python-version }} @@ -34,8 +34,8 @@ jobs: python -m pip install --upgrade pip pip install "nox==$NOX_VERSION" "uv==$UV_VERSION" env: - NOX_VERSION: '2025.2.9' - UV_VERSION: '0.6.15' + NOX_VERSION: '2025.5.1' + UV_VERSION: '0.8.18' - name: Install Test Requirements env: @@ -57,7 +57,7 @@ jobs: echo "flags=$(python -c "import sys; print('{},{},salt_{}'.format('${{ runner.os }}'.replace('-latest', ''), 'py{}{}'.format(*sys.version_info), '_'.join(str(v) for v in '${{ matrix.salt-version }}'.replace('==', '_').split('.'))))")" >> "$GITHUB_OUTPUT" - name: Upload Project Code Coverage - uses: codecov/codecov-action@1f60566a86da84c4b4b64c17662a90de97fbb8d7 # v5.4.2 + uses: codecov/codecov-action@af09b5e394c93991b95a5e7646aeb90c1917f78f # v5.5.1 with: files: artifacts/coverage-project.xml disable_search: true @@ -68,7 +68,7 @@ jobs: version: v10.4.0 - name: Upload Tests Code Coverage - uses: codecov/codecov-action@1f60566a86da84c4b4b64c17662a90de97fbb8d7 # v5.4.2 + uses: codecov/codecov-action@af09b5e394c93991b95a5e7646aeb90c1917f78f # v5.5.1 with: files: artifacts/coverage-tests.xml disable_search: true @@ -100,7 +100,7 @@ jobs: if-no-files-found: error Windows: - runs-on: windows-2022 + runs-on: windows-2025 timeout-minutes: 40 strategy: @@ -108,16 +108,16 @@ jobs: max-parallel: 2 matrix: include: - - {salt-version: "3006.10", python-version: "3.9"} - - {salt-version: "3007.1", python-version: "3.9"} + - {salt-version: "3006.15", python-version: "3.9"} + - {salt-version: "3007.7", python-version: "3.9"} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 with: python-version: ${{ matrix.python-version }} @@ -126,8 +126,8 @@ jobs: python -m pip install --upgrade pip pip install "nox==$env:NOX_VERSION" "uv==$env:UV_VERSION" env: - NOX_VERSION: '2025.2.9' - UV_VERSION: '0.6.15' + NOX_VERSION: '2025.5.1' + UV_VERSION: '0.8.18' - name: Install Test Requirements shell: bash @@ -154,7 +154,7 @@ jobs: echo "flags=$(python -c "import sys; print('{},{},salt_{}'.format('${{ runner.os }}'.replace('-latest', ''), 'py{}{}'.format(*sys.version_info), '_'.join(str(v) for v in '${{ matrix.salt-version }}'.replace('==', '_').split('.'))))")" >> "$GITHUB_OUTPUT" - name: Upload Project Code Coverage - uses: codecov/codecov-action@1f60566a86da84c4b4b64c17662a90de97fbb8d7 # v5.4.2 + uses: codecov/codecov-action@af09b5e394c93991b95a5e7646aeb90c1917f78f # v5.5.1 with: files: artifacts/coverage-project.xml disable_search: true @@ -165,7 +165,7 @@ jobs: version: v10.4.0 - name: Upload Tests Code Coverage - uses: codecov/codecov-action@1f60566a86da84c4b4b64c17662a90de97fbb8d7 # v5.4.2 + uses: codecov/codecov-action@af09b5e394c93991b95a5e7646aeb90c1917f78f # v5.5.1 with: files: artifacts/coverage-tests.xml disable_search: true @@ -205,16 +205,16 @@ jobs: max-parallel: 2 matrix: include: - - {salt-version: "3006.10", python-version: "3.10"} - - {salt-version: "3007.1", python-version: "3.10"} + - {salt-version: "3006.15", python-version: "3.10"} + - {salt-version: "3007.7", python-version: "3.10"} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: fetch-depth: 2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 + uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0 with: python-version: ${{ matrix.python-version }} @@ -223,8 +223,8 @@ jobs: python -m pip install --upgrade pip pip install "nox==$NOX_VERSION" "uv==$UV_VERSION" env: - NOX_VERSION: '2025.2.9' - UV_VERSION: '0.6.15' + NOX_VERSION: '2025.5.1' + UV_VERSION: '0.8.18' - name: Install Test Requirements env: @@ -246,7 +246,7 @@ jobs: echo "flags=$(python -c "import sys; print('{},{},salt_{}'.format('${{ runner.os }}'.replace('-latest', ''), 'py{}{}'.format(*sys.version_info), '_'.join(str(v) for v in '${{ matrix.salt-version }}'.replace('==', '_').split('.'))))")" >> "$GITHUB_OUTPUT" - name: Upload Project Code Coverage - uses: codecov/codecov-action@1f60566a86da84c4b4b64c17662a90de97fbb8d7 # v5.4.2 + uses: codecov/codecov-action@af09b5e394c93991b95a5e7646aeb90c1917f78f # v5.5.1 with: files: artifacts/coverage-project.xml disable_search: true @@ -257,7 +257,7 @@ jobs: version: v10.4.0 - name: Upload Tests Code Coverage - uses: codecov/codecov-action@1f60566a86da84c4b4b64c17662a90de97fbb8d7 # v5.4.2 + uses: codecov/codecov-action@af09b5e394c93991b95a5e7646aeb90c1917f78f # v5.5.1 with: files: artifacts/coverage-tests.xml disable_search: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4c96fb1..d2f9e023 100755 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ minimum_pre_commit_version: 2.4.0 repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # v5.0.0 + rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c # v6.0.0 hooks: - id: check-merge-conflict # Check for files that contain merge conflict strings. args: [--assume-in-merge] @@ -56,7 +56,7 @@ repos: args: [--silent, -E, fix_docstrings] - repo: https://github.com/asottile/pyupgrade - rev: ce40a160603ab0e7d9c627ae33d7ef3906e2d2b2 # v3.19.1 + rev: 37bfa06d791fd38fb4e54910b36a2ff57641b074 # v3.20.0 hooks: - id: pyupgrade name: Rewrite Code to be Py3.9+ @@ -82,7 +82,7 @@ repos: exclude: src/saltext/github/version.py - repo: https://github.com/adamchainz/blacken-docs - rev: 78a9dcbecf4f755f65d1f3dec556bc249d723600 # 1.19.1 + rev: dda8db18cfc68df532abf33b185ecd12d5b7b326 # 1.20.0 hooks: - id: blacken-docs args: [--skip-errors] @@ -93,7 +93,7 @@ repos: # ----- Security ------------------------------------------------------------------------------> - repo: https://github.com/PyCQA/bandit - rev: 8ff25e07e487f143571cc305e56dd0253c60bc7b # 1.8.3 + rev: 2d0b675b04c80ae42277e10500db06a0a37bae17 # 1.8.6 hooks: - id: bandit alias: bandit-salt @@ -102,7 +102,7 @@ repos: exclude: src/saltext/github/version.py - repo: https://github.com/PyCQA/bandit - rev: 8ff25e07e487f143571cc305e56dd0253c60bc7b # 1.8.3 + rev: 2d0b675b04c80ae42277e10500db06a0a37bae17 # 1.8.6 hooks: - id: bandit alias: bandit-tests @@ -123,8 +123,8 @@ repos: files: ^((setup|noxfile)|src/.*)\.py$ require_serial: true additional_dependencies: - - nox==2025.2.9 - - uv==0.6.15 # Makes this hook much faster + - nox==2025.5.1 + - uv==0.8.18 # Makes this hook much faster - id: nox alias: lint-tests @@ -134,13 +134,13 @@ repos: files: ^tests/.*\.py$ require_serial: true additional_dependencies: - - nox==2025.2.9 - - uv==0.6.15 # Makes this hook much faster + - nox==2025.5.1 + - uv==0.8.18 # Makes this hook much faster - repo: https://github.com/Mateusz-Grzelinski/actionlint-py - rev: a185be0fd5b45112845b700d91b81050c75579e2 # v1.7.7.23 + rev: f999ae59ac949d9b57aaa5569c2d60eb846b3a00 # v1.7.7.24 hooks: - id: actionlint additional_dependencies: - - shellcheck-py==0.10.0.1 + - shellcheck-py==0.11.0.1 # <---- Code Analysis -------------------------------------------------------------------------- diff --git a/noxfile.py b/noxfile.py index 0dad5ee7..cfd338f5 100755 --- a/noxfile.py +++ b/noxfile.py @@ -31,7 +31,7 @@ SKIP_REQUIREMENTS_INSTALL = os.environ.get("SKIP_REQUIREMENTS_INSTALL", "0") == "1" EXTRA_REQUIREMENTS_INSTALL = os.environ.get("EXTRA_REQUIREMENTS_INSTALL") -COVERAGE_REQUIREMENT = os.environ.get("COVERAGE_REQUIREMENT") or "coverage==7.8.0" +COVERAGE_REQUIREMENT = os.environ.get("COVERAGE_REQUIREMENT") or "coverage==7.10.6" SALT_REQUIREMENT = os.environ.get("SALT_REQUIREMENT") or "salt>=3006" if SALT_REQUIREMENT == "salt==master": SALT_REQUIREMENT = "git+https://github.com/saltstack/salt.git@master" diff --git a/pyproject.toml b/pyproject.toml index 04be368c..37c56a5a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ Source = "https://github.com/salt-extensions/saltext-github" Tracker = "https://github.com/salt-extensions/saltext-github/issues" [project.optional-dependencies] -changelog = ["towncrier==24.8.0"] +changelog = ["towncrier==25.8.0"] dev = [ "nox[uv]>=2024.3,!=2025.05.01", "pre-commit>=2.21.0", @@ -61,14 +61,14 @@ dev = [ dev_extra = [ "black==25.1.0", "isort==6.0.1", - "coverage==7.8.0", + "coverage==7.10.6", ] docs = [ "sphinx", "sphinx-prompt", "sphinxcontrib-spelling", "sphinx-copybutton", - "towncrier==24.8.0", + "towncrier==25.8.0", "sphinxcontrib-towncrier", "myst_parser", "furo",