Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 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-22.04
runs-on: ubuntu-latest

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

determine-changes:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
outputs:
tests: ${{ steps.filter.outputs.tests }}
vendoring: ${{ steps.filter.outputs.vendoring }}
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, windows-latest]
os: [ubuntu-latest, windows-latest]

steps:
- uses: actions/checkout@v5
Expand All @@ -86,7 +86,7 @@ jobs:

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

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

- name: Install Ubuntu dependencies
if: matrix.os == 'ubuntu-22.04'
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update
sudo apt-get install bzr
sudo apt-get install brz subversion

- name: Install MacOS dependencies
if: runner.os == 'macOS'
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
- tests-zipapp
- vendoring

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

steps:
- name: Decide whether the needed jobs succeeded or failed
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2

build:
os: ubuntu-22.04
os: ubuntu-lts-latest
tools:
python: "3.11"
jobs:
Expand Down
19 changes: 14 additions & 5 deletions tests/functional/test_pep668.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,24 @@ def patch_check_externally_managed(virtualenv: VirtualEnvironment) -> None:
# Since the tests are run from a virtual environment, and we can't
# guarantee access to the actual stdlib location (where EXTERNALLY-MANAGED
# needs to go into), we patch the check to always raise a simple message.

# Allow user site packages so that --user doesn't fail early
virtualenv.user_site_packages = True

virtualenv.sitecustomize = textwrap.dedent(
"""\
from pip._internal.exceptions import ExternallyManagedEnvironment
from pip._internal.utils import misc
try:
from pip._internal.exceptions import ExternallyManagedEnvironment
from pip._internal.utils import misc

def check_externally_managed():
raise ExternallyManagedEnvironment("I am externally managed")
def check_externally_managed():
raise ExternallyManagedEnvironment("I am externally managed")

misc.check_externally_managed = check_externally_managed
misc.check_externally_managed = check_externally_managed
except ImportError:
# pip modules not available at sitecustomize time
# This can happen in CI environments with different timing
pass
"""
)

Expand Down
Loading