Skip to content

Commit 1381a40

Browse files
authored
fix: support macos-14, avoid macos-latest (#417)
1 parent dd2f9fd commit 1381a40

File tree

5 files changed

+16
-7
lines changed

5 files changed

+16
-7
lines changed

.github/workflows/reusable-cookie.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
python-version: ["3.8", "3.12"]
28-
runs-on: [ubuntu-latest, macos-latest, windows-latest]
28+
runs-on: [ubuntu-latest, windows-latest]
2929

3030
include:
3131
- python-version: pypy-3.9
3232
runs-on: ubuntu-latest
33+
- python-version: "3.8"
34+
runs-on: macos-13
35+
- python-version: "3.12"
36+
runs-on: macos-14
3337

3438
steps:
3539
- uses: actions/checkout@v4

.github/workflows/reusable-rr-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.10", "3.11", "3.12-dev"]
19-
runs-on: [ubuntu-latest, macos-latest, windows-latest]
18+
python-version: ["3.10", "3.11", "3.12"]
19+
runs-on: [ubuntu-latest, macos-14, windows-latest]
2020

2121
steps:
2222
- uses: actions/checkout@v4

{{cookiecutter.project_name}}/.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,15 @@ jobs:
4343
fail-fast: false
4444
matrix:
4545
python-version: ["3.8", "3.12"]
46-
runs-on: [ubuntu-latest, macos-latest, windows-latest]
46+
runs-on: [ubuntu-latest, windows-latest]
4747

4848
include:
49-
- python-version: pypy-3.10
49+
- python-version: "pypy-3.10"
5050
runs-on: ubuntu-latest
51+
- python-version: "3.8"
52+
runs-on: macos-13
53+
- python-version: "3.12"
54+
runs-on: macos-14
5155

5256
steps:
5357
- uses: actions/checkout@v4

{{cookiecutter.project_name}}/.github/workflows/{% if cookiecutter.__type=='compiled' %}cd.yml{% endif %}

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
os: [ubuntu-latest, windows-latest, macos-latest]
41+
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
4242

4343
steps:
4444
- uses: actions/checkout@v4

{{cookiecutter.project_name}}/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ pytest-cov = { version = ">=3", optional = true }
122122
sphinx = { version = ">=7.0", optional = true }
123123
sphinx_copybutton = { version = ">=0.3.0", optional = true }
124124
sphinx-autodoc-typehints = { version = "*", optional = true }
125+
docutils = { version = "!=0.21.post1", optional = true }
125126

126127
[tool.poetry.dev-dependencies]
127128
pytest = ">= 6"
@@ -136,6 +137,7 @@ docs = [
136137
"sphinx",
137138
"sphinx_autodoc_typehints",
138139
"sphinx_copybutton",
140+
"docutils",
139141
]
140142

141143
{%- if cookiecutter.vcs %}
@@ -297,7 +299,6 @@ write_to = "src/{{ cookiecutter.__project_slug }}/_version.py"
297299
[tool.cibuildwheel]
298300
test-command = "pytest {project}/tests"
299301
test-extras = ["test"]
300-
test-skip = ["*universal2:arm64"]
301302
{%- endif %}
302303

303304

0 commit comments

Comments
 (0)