Skip to content

Commit 2bbb71f

Browse files
molinavmolinav
committed
Reformat workflow files
1 parent 0167beb commit 2bbb71f

File tree

4 files changed

+41
-140
lines changed

4 files changed

+41
-140
lines changed

‎.github/workflows/basemap-data-hires.yml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
push:
88
paths:
99
- ".github/workflows/basemap-data-hires.yml"
10-
- "packages/basemap_data_hires"
10+
- "packages/basemap_data_hires/**"
1111
pull_request:
1212
paths:
1313
- ".github/workflows/basemap-data-hires.yml"
14-
- "packages/basemap_data_hires"
14+
- "packages/basemap_data_hires/**"
1515
workflow_dispatch:
1616

1717
jobs:
@@ -33,13 +33,11 @@ jobs:
3333
strategy:
3434
matrix:
3535
python-version:
36-
[
37-
"2.7",
38-
]
36+
["2.7"]
3937
max-parallel: 1
4038
needs: checkout
4139
runs-on: ubuntu-latest
42-
container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
40+
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
4341
steps:
4442
-
4543
name: Download checkout
@@ -63,18 +61,7 @@ jobs:
6361
strategy:
6462
matrix:
6563
python-version:
66-
[
67-
"2.6",
68-
"2.7",
69-
"3.2",
70-
"3.3",
71-
"3.4",
72-
"3.5",
73-
"3.6",
74-
"3.7",
75-
"3.8",
76-
"3.9",
77-
]
64+
["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
7865
max-parallel: 3
7966
fail-fast: false
8067
needs: build
@@ -106,9 +93,7 @@ jobs:
10693
strategy:
10794
matrix:
10895
python-version:
109-
[
110-
"2.7",
111-
]
96+
["2.7"]
11297
max-parallel: 1
11398
if: startsWith(github.event.ref, 'refs/tags/v')
11499
needs: test

‎.github/workflows/basemap-data.yml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
push:
88
paths:
99
- ".github/workflows/basemap-data.yml"
10-
- "packages/basemap_data"
10+
- "packages/basemap_data/**"
1111
pull_request:
1212
paths:
1313
- ".github/workflows/basemap-data.yml"
14-
- "packages/basemap_data"
14+
- "packages/basemap_data/**"
1515
workflow_dispatch:
1616

1717
jobs:
@@ -33,13 +33,11 @@ jobs:
3333
strategy:
3434
matrix:
3535
python-version:
36-
[
37-
"2.7",
38-
]
36+
["2.7"]
3937
max-parallel: 1
4038
needs: checkout
4139
runs-on: ubuntu-latest
42-
container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
40+
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
4341
steps:
4442
-
4543
name: Download checkout
@@ -63,18 +61,7 @@ jobs:
6361
strategy:
6462
matrix:
6563
python-version:
66-
[
67-
"2.6",
68-
"2.7",
69-
"3.2",
70-
"3.3",
71-
"3.4",
72-
"3.5",
73-
"3.6",
74-
"3.7",
75-
"3.8",
76-
"3.9",
77-
]
64+
["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
7865
max-parallel: 3
7966
fail-fast: false
8067
needs: build
@@ -106,9 +93,7 @@ jobs:
10693
strategy:
10794
matrix:
10895
python-version:
109-
[
110-
"2.7",
111-
]
96+
["2.7"]
11297
max-parallel: 1
11398
if: startsWith(github.event.ref, 'refs/tags/v')
11499
needs: test

‎.github/workflows/basemap-for-manylinux.yml

Lines changed: 11 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
push:
88
paths:
99
- ".github/workflows/basemap-for-manylinux.yml"
10-
- "packages/basemap"
10+
- "packages/basemap/**"
1111
pull_request:
1212
paths:
1313
- ".github/workflows/basemap-for-manylinux.yml"
14-
- "packages/basemap"
14+
- "packages/basemap/**"
1515
workflow_dispatch:
1616

1717
jobs:
@@ -33,10 +33,7 @@ jobs:
3333
strategy:
3434
matrix:
3535
arch:
36-
[
37-
"x64",
38-
"x86",
39-
]
36+
["x64", "x86"]
4037
max-parallel: 2
4138
fail-fast: false
4239
needs: checkout
@@ -85,19 +82,9 @@ jobs:
8582
strategy:
8683
matrix:
8784
arch:
88-
[
89-
"x64",
90-
"x86",
91-
]
85+
["x64", "x86"]
9286
python-version:
93-
[
94-
"2.7",
95-
"3.5",
96-
"3.6",
97-
"3.7",
98-
"3.8",
99-
"3.9",
100-
]
87+
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
10188
max-parallel: 3
10289
fail-fast: false
10390
needs: build-geos
@@ -163,19 +150,9 @@ jobs:
163150
strategy:
164151
matrix:
165152
arch:
166-
[
167-
"x64",
168-
"x86",
169-
]
153+
["x64", "x86"]
170154
python-version:
171-
[
172-
"2.7",
173-
"3.5",
174-
"3.6",
175-
"3.7",
176-
"3.8",
177-
"3.9",
178-
]
155+
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
179156
max-parallel: 3
180157
fail-fast: false
181158
needs: build
@@ -225,19 +202,9 @@ jobs:
225202
strategy:
226203
matrix:
227204
arch:
228-
[
229-
"x64",
230-
"x86",
231-
]
205+
["x64", "x86"]
232206
python-version:
233-
[
234-
"2.7",
235-
"3.5",
236-
"3.6",
237-
"3.7",
238-
"3.8",
239-
"3.9",
240-
]
207+
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
241208
max-parallel: 3
242209
fail-fast: false
243210
needs: repair
@@ -300,19 +267,9 @@ jobs:
300267
strategy:
301268
matrix:
302269
arch:
303-
[
304-
"x64",
305-
"x86",
306-
]
270+
["x64", "x86"]
307271
python-version:
308-
[
309-
"2.7",
310-
"3.5",
311-
"3.6",
312-
"3.7",
313-
"3.8",
314-
"3.9",
315-
]
272+
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
316273
max-parallel: 1
317274
if: startsWith(github.event.ref, 'refs/tags/v')
318275
needs: test

‎.github/workflows/basemap-for-windows.yml

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ on:
77
push:
88
paths:
99
- ".github/workflows/basemap-for-windows.yml"
10-
- "packages/basemap"
10+
- "packages/basemap/**"
1111
pull_request:
1212
paths:
1313
- ".github/workflows/basemap-for-windows.yml"
14-
- "packages/basemap"
14+
- "packages/basemap/**"
1515
workflow_dispatch:
1616

1717
jobs:
@@ -33,16 +33,20 @@ jobs:
3333
strategy:
3434
matrix:
3535
include:
36-
- arch: "x64"
36+
-
37+
arch: "x64"
3738
msvc-toolset: "14.16"
3839
cmake-version: "3.14.7"
39-
- arch: "x86"
40+
-
41+
arch: "x86"
4042
msvc-toolset: "14.16"
4143
cmake-version: "3.13.2"
42-
- arch: "x64"
44+
-
45+
arch: "x64"
4346
msvc-toolset: "9.0"
4447
cmake-version: "3.14.7"
45-
- arch: "x86"
48+
-
49+
arch: "x86"
4650
msvc-toolset: "9.0"
4751
cmake-version: "3.13.2"
4852
max-parallel: 4
@@ -89,19 +93,9 @@ jobs:
8993
strategy:
9094
matrix:
9195
arch:
92-
[
93-
"x64",
94-
"x86",
95-
]
96+
["x64", "x86"]
9697
python-version:
97-
[
98-
"2.7",
99-
"3.5",
100-
"3.6",
101-
"3.7",
102-
"3.8",
103-
"3.9",
104-
]
98+
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
10599
max-parallel: 3
106100
fail-fast: false
107101
needs: build-geos
@@ -182,19 +176,9 @@ jobs:
182176
strategy:
183177
matrix:
184178
arch:
185-
[
186-
"x64",
187-
"x86",
188-
]
179+
["x64", "x86"]
189180
python-version:
190-
[
191-
"2.7",
192-
"3.5",
193-
"3.6",
194-
"3.7",
195-
"3.8",
196-
"3.9",
197-
]
181+
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
198182
max-parallel: 3
199183
fail-fast: false
200184
needs: build
@@ -231,19 +215,9 @@ jobs:
231215
strategy:
232216
matrix:
233217
arch:
234-
[
235-
"x64",
236-
"x86",
237-
]
218+
["x64", "x86"]
238219
python-version:
239-
[
240-
"2.7",
241-
"3.5",
242-
"3.6",
243-
"3.7",
244-
"3.8",
245-
"3.9",
246-
]
220+
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
247221
max-parallel: 1
248222
if: startsWith(github.event.ref, 'refs/tags/v')
249223
needs: test
@@ -275,6 +249,6 @@ jobs:
275249
run: |
276250
python -m twine check `
277251
${{ env.PKGDIR }}/dist/*.zip `
278-
${{ env.PKGDIR }}/dist/*-win*.whl
252+
${{ env.PKGDIR }}/dist/*.whl
279253
python -m twine upload --skip-existing `
280-
${{ env.PKGDIR }}/dist/*-win*.whl
254+
${{ env.PKGDIR }}/dist/*.whl

0 commit comments

Comments
 (0)