Skip to content

Commit ffb2c66

Browse files
committed
Merge branch 'main' into devel
# Conflicts: # src/meshlab
2 parents aaa50b5 + b068285 commit ffb2c66

File tree

3 files changed

+9
-33
lines changed

3 files changed

+9
-33
lines changed

.github/workflows/BuildAndTest.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
16+
pyversion: ['3.10', '3.11', '3.12', '3.13', '3.14']
1717
os: ['ubuntu-22.04', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
18-
exclude:
19-
- os: macos-latest
20-
pyversion: '3.9'
2118
steps:
2219
- uses: actions/checkout@v4
2320
with:
@@ -96,11 +93,8 @@ jobs:
9693
strategy:
9794
fail-fast: false
9895
matrix:
99-
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
96+
pyversion: ['3.10', '3.11', '3.12', '3.13', '3.14']
10097
os: ['ubuntu-22.04', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
101-
exclude:
102-
- os: macos-latest
103-
pyversion: '3.9'
10498
steps:
10599
- uses: actions/checkout@v4
106100
- name: Setup env variables
@@ -138,11 +132,8 @@ jobs:
138132
strategy:
139133
fail-fast: false
140134
matrix:
141-
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
135+
pyversion: ['3.10', '3.11', '3.12', '3.13', '3.14']
142136
os: ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
143-
exclude:
144-
- os: macos-latest
145-
pyversion: '3.9'
146137
steps:
147138
- name: Setup env variables
148139
id: envs
@@ -186,11 +177,8 @@ jobs:
186177
strategy:
187178
fail-fast: false
188179
matrix:
189-
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
180+
pyversion: ['3.10', '3.11', '3.12', '3.13', '3.14']
190181
os: ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
191-
exclude:
192-
- os: macos-latest
193-
pyversion: '3.9'
194182
steps:
195183
- name: Setup env variables
196184
id: envs

.github/workflows/CreateAndTestRelease.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,8 @@ jobs:
3232
needs: update_version
3333
strategy:
3434
matrix:
35-
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
35+
pyversion: ['3.10', '3.11', '3.12', '3.13', '3.14']
3636
os: ['ubuntu-22.04', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
37-
exclude:
38-
- os: macos-latest
39-
pyversion: '3.9'
4037
steps:
4138
- uses: actions/checkout@v4
4239
with:
@@ -115,11 +112,8 @@ jobs:
115112
needs: build_pymeshlab
116113
strategy:
117114
matrix:
118-
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
115+
pyversion: ['3.10', '3.11', '3.12', '3.13', '3.14']
119116
os: ['ubuntu-22.04', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
120-
exclude:
121-
- os: macos-latest
122-
pyversion: '3.9'
123117
steps:
124118
- uses: actions/checkout@v4
125119
with:
@@ -156,11 +150,8 @@ jobs:
156150
needs: build_pymeshlab
157151
strategy:
158152
matrix:
159-
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
153+
pyversion: ['3.10', '3.11', '3.12', '3.13', '3.14']
160154
os: ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
161-
exclude:
162-
- os: macos-latest
163-
pyversion: '3.9'
164155
steps:
165156
- name: Setup env variables
166157
id: envs
@@ -203,11 +194,8 @@ jobs:
203194
runs-on: ${{ matrix.os }}
204195
strategy:
205196
matrix:
206-
pyversion: ['3.9', '3.10', '3.11', '3.12', '3.13']
197+
pyversion: ['3.10', '3.11', '3.12', '3.13', '3.14']
207198
os: ['ubuntu-latest', 'ubuntu-22.04-arm', 'macos-13', 'macos-latest', 'windows-latest']
208-
exclude:
209-
- os: macos-latest
210-
pyversion: '3.9'
211199
steps:
212200
- name: Setup env variables
213201
id: envs

src/meshlab

0 commit comments

Comments
 (0)