Skip to content

Commit e85a548

Browse files
committed
CI: Test on macOS arm64
1 parent e98cc5c commit e85a548

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
pull_request:
1111
schedule:
1212
- cron: 0 0 * * MON # Run every Monday at 00:00 UTC
13+
workflow_dispatch:
14+
# allow manual runs on branches without a PR
1315

1416
env:
1517
# The "FORCE_COLOR" variable, when set to 1,
@@ -107,7 +109,7 @@ jobs:
107109
strategy:
108110
fail-fast: true
109111
matrix:
110-
os: [ubuntu-latest, macos-12]
112+
os: [ubuntu-latest, macos-12, macos-latest]
111113
python:
112114
- "3.8"
113115
- "3.9"
@@ -130,8 +132,13 @@ jobs:
130132
sudo apt-get install bzr
131133
132134
- name: Install MacOS dependencies
133-
if: matrix.os == 'macos-12'
134-
run: brew install breezy
135+
if: runner.os == 'macOS'
136+
run: |
137+
DEPS=breezy
138+
if ! which svn; then
139+
DEPS="${DEPS} subversion"
140+
fi
141+
brew install ${DEPS}
135142
136143
- run: pip install nox
137144

news/F2CF2568-49B1-49EF-8B16-70491B9C8FDA.trivial.rst

Whitespace-only changes.

tests/functional/test_uninstall_user.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
tests specific to uninstalling --user installs
33
"""
44

5+
import platform
6+
import sys
57
from os.path import isdir, isfile, normcase
68

79
import pytest
@@ -74,6 +76,12 @@ def test_uninstall_from_usersite_with_dist_in_global_site(
7476
dist_info_folder = script.base_path / script.site_packages / "pkg-0.1.dist-info"
7577
assert isdir(dist_info_folder)
7678

79+
@pytest.mark.xfail(
80+
sys.platform == "darwin"
81+
and platform.machine() == "arm64"
82+
and sys.version_info[:2] in {(3, 8), (3, 9)},
83+
reason="Unexpected egg-link install path",
84+
)
7785
def test_uninstall_editable_from_usersite(
7886
self, script: PipTestEnvironment, data: TestData
7987
) -> None:

tests/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pytest-rerunfailures
88
pytest-xdist
99
scripttest
1010
setuptools
11-
virtualenv < 20.0 ; python_version < '3.10'
12-
virtualenv >= 20.0 ; python_version >= '3.10'
11+
virtualenv < 20.0 ; python_version < '3.10' and (sys_platform != 'darwin' or platform_machine != 'arm64')
12+
virtualenv >= 20.0 ; python_version >= '3.10' or (sys_platform == 'darwin' and platform_machine == 'arm64')
1313
werkzeug
1414
wheel
1515
tomli-w

0 commit comments

Comments
 (0)