diff --git a/.github/workflows/auto-merge-prs.yml b/.github/workflows/auto-merge-prs.yml index 4d8d5bb068..5ab05f6a32 100644 --- a/.github/workflows/auto-merge-prs.yml +++ b/.github/workflows/auto-merge-prs.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.GH_TAGGING_TOKEN }} diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index 726f80990b..1d8f71ef78 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -9,9 +9,9 @@ jobs: check-version: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.11' - name: Install dependencies @@ -43,9 +43,9 @@ jobs: needs.check-version.outputs.new_release == 'true' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: '3.11' - name: Install dependencies diff --git a/.github/workflows/docs-language-linter.yml b/.github/workflows/docs-language-linter.yml index c65e8c8e58..93e1ce9c67 100644 --- a/.github/workflows/docs-language-linter.yml +++ b/.github/workflows/docs-language-linter.yml @@ -11,7 +11,7 @@ jobs: name: runner / vale runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: errata-ai/vale-action@reviewdog with: reporter: github-pr-check diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 45e37525ac..c4a08e2738 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -20,28 +20,28 @@ jobs: runs-on: ${{ inputs.os }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} - name: Set up Python ${{inputs.python-version}} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{inputs.python-version}} - name: Cache python packages for Linux if: inputs.os == 'ubuntu-latest' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{inputs.os}}-python-${{inputs.python-version}} - name: Cache python packages for Windows if: inputs.os == 'windows-latest' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~\AppData\Local\pip\Cache key: ${{inputs.os}}-python-${{inputs.python-version}} - name: Add MSBuild to PATH if: inputs.os == 'windows-latest' - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Install Microsoft Visual C++ Redistributable if: inputs.os == 'windows-latest' run: | diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f5befa280c..76bbe15654 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,15 +16,15 @@ jobs: runs-on: ${{ inputs.os }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.python-version }} - name: Cache python packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{inputs.os}}-python-${{inputs.python-version}} diff --git a/.github/workflows/pip-compile.yml b/.github/workflows/pip-compile.yml index 2b89df2563..0e16e644d2 100644 --- a/.github/workflows/pip-compile.yml +++ b/.github/workflows/pip-compile.yml @@ -16,28 +16,28 @@ jobs: runs-on: ${{ inputs.os }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} - name: Set up Python ${{inputs.python-version}} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{inputs.python-version}} - name: Cache python packages for Linux if: inputs.os == 'ubuntu-latest' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{inputs.os}}-python-${{inputs.python-version}} - name: Cache python packages for Windows if: inputs.os == 'windows-latest' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~\AppData\Local\pip\Cache key: ${{inputs.os}}-python-${{inputs.python-version}} - name: Add MSBuild to PATH if: inputs.os == 'windows-latest' - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Install dependencies run: | make install-test-requirements diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index d8bf3be9f0..e5ee8ab4d9 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.GH_TAGGING_TOKEN }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 8aaac809f4..77c8a53acf 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -15,28 +15,28 @@ jobs: runs-on: ${{ inputs.os }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ inputs.branch }} - name: Set up Python ${{inputs.python-version}} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{inputs.python-version}} - name: Cache python packages for Linux if: inputs.os == 'ubuntu-latest' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{inputs.os}}-python-${{inputs.python-version}} - name: Cache python packages for Windows if: inputs.os == 'windows-latest' - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~\AppData\Local\pip\Cache key: ${{inputs.os}}-python-${{inputs.python-version}} - name: Add MSBuild to PATH if: inputs.os == 'windows-latest' - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: Install dependencies run: | make install-test-requirements diff --git a/Makefile b/Makefile index 5b569bbc82..9874a0923d 100644 --- a/Makefile +++ b/Makefile @@ -45,9 +45,7 @@ package: clean install python -m pip install build && python -m build install-test-requirements: -# pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 -# pip==23.3 breaks dependency resolution - python -m pip install -U "pip>=21.2,<23.2" + python -m pip install -U "pip>=21.2" pip install .[test] install-pre-commit: diff --git a/features/environment.py b/features/environment.py index c2254b49a2..26a6090a6e 100644 --- a/features/environment.py +++ b/features/environment.py @@ -115,9 +115,7 @@ def _setup_minimal_env(context): "pip", "install", "-U", - # pip==23.2 breaks pip-tools<7.0, and pip-tools>=7.0 does not support Python 3.7 - # pip==23.3 breaks dependency resolution - "pip>=21.2,<23.2", + "pip>=21.2", ], env=context.env, )