Bump piped from 05de4b9 to 04d4cf4 (#973)

Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: always-on-duty[bot] <120557446+always-on-duty[bot]@users.noreply.github.com>
FasterSpeeding · Nov 19, 2024 · 321b52b · 321b52b
1 parent ed15877
commit 321b52b
Show file tree

Hide file tree

Showing 18 changed files with 299 additions and 378 deletions.
diff --git a/.github/actions/setup-py/action.yml b/.github/actions/setup-py/action.yml
@@ -0,0 +1,19 @@
+name: "Install Python"
+description: "Install a specific Python version"
+inputs:
+  python-version:
+    description: "Python version to install"
+    required: false
+    default: "3.11"
+runs:
+  using: composite
+  steps:
+    - name: Set up Python ${{ inputs.python-version }}
+      uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
+      id: install-py
+      with:
+        python-version: ${{ inputs.python-version }}
+
+    - name: Install Nox
+      run: pipx install nox --python "${{ steps.install-py.outputs.python-path }}"
+      shell: bash
diff --git a/.github/workflows/freeze-for-pr.yml b/.github/workflows/freeze-for-pr.yml
@@ -19,23 +19,16 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Upgrade dependency locks
-        run: python -m nox -s freeze-locks bot-package-diff
+        run: nox -s freeze-locks bot-package-diff
 
       - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
         with:
           name: gogo.patch
           path: gogo.patch
 
       - name: Check diff file
-        run: python -m nox -s is-diff-file-empty
+        run: nox -s is-diff-file-empty
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -24,24 +24,17 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Lint markup
-        run: python -m nox -s verify-markup
+        run: nox -s verify-markup
 
       - name: Check spelling
-        run: python -m nox -s spell-check
+        run: nox -s spell-check
 
       - name: Lint with flake8
-        run: python -m nox -s flake8
+        run: nox -s flake8
 
       - name: Check slotting
-        run: python -m nox -s slot-check
+        run: nox -s slot-check
diff --git a/.github/workflows/pr-docs.yml b/.github/workflows/pr-docs.yml
@@ -28,23 +28,14 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           submodules: "true"
 
-      - name: Set up Python 3.11
-        if: github.event.action != 'closed'
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        if: github.event.action != 'closed'
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Build docs
         if: github.event.action != 'closed'
         run: |
           mkdir site
-          python -m nox -s generate-docs -- -o ./site
+          nox -s generate-docs -- -o ./site
 
       - name: Deploy preview
         uses: FasterSpeeding/pr-preview-action@task/override-committer

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -22,16 +22,11 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Build project
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
-          python -m nox -s build
+        run: nox -s build
 
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc
diff --git a/.github/workflows/py-test.yml b/.github/workflows/py-test.yml
@@ -30,19 +30,13 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
+      - name: Install Python
+        uses: ./.github/actions/setup-py
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
-
       - name: Run tests
-        run: |
-          python -m nox -s test
+        run: nox -s test
 
   # TODO: Could we switch over to gather coverage from the normal test runs and combining
   # the result once https://github.com/nedbat/coveragepy/issues/1002 is fixed?
@@ -55,19 +49,11 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Record coverage
-        run: |
-          python -m nox -s test-coverage
+        run: nox -s test-coverage
 
       - name: Upload coverage
         uses: paambaati/codeclimate-action@f429536ee076d758a24705203199548125a28ca7

diff --git a/.github/workflows/reformat.yml b/.github/workflows/reformat.yml
@@ -18,23 +18,16 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Reformat
-        run: python -m nox -s reformat bot-package-diff
+        run: nox -s reformat bot-package-diff
 
       - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
         with:
           name: gogo.patch
           path: gogo.patch
 
       - name: Check diff file
-        run: python -m nox -s is-diff-file-empty
+        run: nox -s is-diff-file-empty
diff --git a/.github/workflows/release-docs.yml b/.github/workflows/release-docs.yml
@@ -13,21 +13,14 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: Install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Build docs
         id: doc_info
         run: |
           mkdir site
-          python -m nox -s generate-docs -- -o ./site -j
+          nox -s generate-docs -- -o ./site -j
           echo "GIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_STATE
 
       - name: Push

diff --git a/.github/workflows/resync-piped.yml b/.github/workflows/resync-piped.yml
@@ -19,23 +19,16 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Resync Piped
-        run: python -m nox -s copy-piped bot-package-diff
+        run: nox -s copy-piped bot-package-diff
 
       - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
         with:
           name: gogo.patch
           path: gogo.patch
 
       - name: Check diff file
-        run: python -m nox -s is-diff-file-empty
+        run: nox -s is-diff-file-empty
diff --git a/.github/workflows/type-check.yml b/.github/workflows/type-check.yml
@@ -24,15 +24,8 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Run type checker
-        run: python -m nox -s type-check
+        run: nox -s type-check
diff --git a/.github/workflows/update-licence.yml b/.github/workflows/update-licence.yml
@@ -14,18 +14,11 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Update licence
-        run: python -m nox -s update-licence
+        run: nox -s update-licence
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f

diff --git a/.github/workflows/upgrade-locks.yml b/.github/workflows/upgrade-locks.yml
@@ -14,18 +14,11 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Upgrade dependency locks
-        run: python -m nox -s freeze-locks
+        run: nox -s freeze-locks
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f

diff --git a/.github/workflows/verify-locks.yml b/.github/workflows/verify-locks.yml
@@ -22,15 +22,8 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Verify dependency locks
-        run: python -m nox -s verify-deps
+        run: nox -s verify-deps
diff --git a/.github/workflows/verify-types.yml b/.github/workflows/verify-types.yml
@@ -24,15 +24,8 @@ jobs:
         with:
           submodules: "true"
 
-      - name: Set up Python 3.11
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b
-        with:
-          python-version: "3.11"
-
-      - name: install prerequisites
-        run: |
-          python -m pip install --upgrade pip wheel
-          python -m pip install -r ./piped/python/base-requirements/nox.txt
+      - name: Install Python
+        uses: ./.github/actions/setup-py
 
       - name: Run verify types
-        run: python -m nox -s verify-types
+        run: nox -s verify-types