Skip to content

Commit

Permalink
Merge branch 'main' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
ichard26 authored Jan 11, 2025
2 parents 102f58b + 23e9222 commit 9d849b6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 13 deletions.
25 changes: 13 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ concurrency:
jobs:
docs:
name: docs
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
Expand All @@ -36,7 +36,7 @@ jobs:
- run: nox -s docs

determine-changes:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
tests: ${{ steps.filter.outputs.tests }}
vendoring: ${{ steps.filter.outputs.vendoring }}
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:

packaging:
name: packaging
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
Expand All @@ -83,7 +83,7 @@ jobs:

vendoring:
name: vendoring
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

needs: [determine-changes]
if: >-
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest, macos-13, macos-latest]
os: [ubuntu-22.04, macos-13, macos-latest]
python:
- "3.8"
- "3.9"
Expand All @@ -129,7 +129,7 @@ jobs:
allow-prereleases: true

- name: Install Ubuntu dependencies
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu-22.04'
run: |
sudo apt-get update
sudo apt-get install bzr
Expand Down Expand Up @@ -216,7 +216,10 @@ jobs:
tests-zipapp:
name: tests / zipapp
runs-on: ubuntu-latest
# The macos-latest (M1) runners are the fastest available on GHA, even
# beating out the ubuntu-latest runners. The zipapp tests are slow by
# nature, and we don't care where they run, so we pick the fastest one.
runs-on: macos-latest

needs: [packaging, determine-changes]
if: >-
Expand All @@ -229,10 +232,8 @@ jobs:
with:
python-version: "3.10"

- name: Install Ubuntu dependencies
run: |
sudo apt-get update
sudo apt-get install bzr
- name: Install MacOS dependencies
run: brew install breezy subversion

- run: pip install nox

Expand All @@ -257,7 +258,7 @@ jobs:
- tests-zipapp
- vendoring

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Decide whether the needed jobs succeeded or failed
Expand Down
1 change: 1 addition & 0 deletions news/13148.trivial.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix mypy 1.14.1 error
1 change: 1 addition & 0 deletions news/13152.trivial.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Switch to ubuntu-22.04 for github workflow.
2 changes: 1 addition & 1 deletion src/pip/_internal/utils/unpacking.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def untar_file(filename: str, location: str) -> None:
)
mode = "r:*"

tar = tarfile.open(filename, mode, encoding="utf-8")
tar = tarfile.open(filename, mode, encoding="utf-8") # type: ignore
try:
leading = has_leading_dir([member.name for member in tar.getmembers()])

Expand Down

0 comments on commit 9d849b6

Please sign in to comment.