Skip to content

Commit e195a3b

Browse files
committed
Upgrade image base in basemap-for-manylinux outside build
Let's make life a bit easier.
1 parent bfbe4fa commit e195a3b

File tree

1 file changed

+9
-26
lines changed

1 file changed

+9
-26
lines changed

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

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
fail-fast: false
160160
needs: build
161161
runs-on: ubuntu-latest
162-
container: "pylegacy/${{ matrix.arch }}-python:3.6-debian-5"
162+
container: "pylegacy/${{ matrix.arch }}-python:3.6-debian-8"
163163
steps:
164164
-
165165
name: Download GEOS artifacts
@@ -211,7 +211,7 @@ jobs:
211211
fail-fast: false
212212
needs: repair
213213
runs-on: ubuntu-latest
214-
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-5"
214+
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-8"
215215
steps:
216216
-
217217
name: Download checkout
@@ -225,37 +225,20 @@ jobs:
225225
with:
226226
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
227227
path: ${{ env.PKGDIR }}/dist
228-
-
229-
name: Install GCC toolchain
230-
run: |
231-
apt-get update
232-
apt-get install -y gcc g++ make
233228
-
234229
name: Install matplotlib dependencies
235230
run: |
236231
apt-get update
237-
apt-get install -y libfreetype6-dev libpng12-dev
232+
apt-get install -y gcc g++ make
233+
apt-get install -y pkg-config libfreetype6-dev libpng12-dev
238234
if: matrix.arch == 'x86' && matrix.python-version == '3.5'
239235
-
240-
name: Install pyproj manually
236+
name: Install numpy from source
241237
run: |
242238
apt-get update
243-
apt-get install -y proj-bin libproj-dev
244-
python -m pip install cython
245-
pkgname=pyproj
246-
pkgvers=${{ env.pyproj-version }}
247-
pkgcode=${pkgname}-${pkgvers}
248-
python -m pip download "pyproj == ${pkgvers}"
249-
tar -xf ${pkgcode}.tar.gz
250-
rm -rf ${pkgcode}.tar.gz
251-
cd ${pkgcode}
252-
rm _proj.c
253-
python -m pip install .
254-
cd ..
255-
rm -rf ${pkgcode}
256-
if: matrix.python-version == '3.9' || matrix.python-version == '3.10'
257-
env:
258-
pyproj-version: 1.9.6
239+
apt-get install -y gcc g++ make
240+
pip install "numpy < 1.21.5"
241+
if: matrix.arch == 'x86' && matrix.python-version == '3.10'
259242
-
260243
name: Install package
261244
run: |
@@ -276,7 +259,7 @@ jobs:
276259
if: startsWith(github.event.ref, 'refs/tags/v')
277260
needs: test
278261
runs-on: ubuntu-latest
279-
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-5"
262+
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-8"
280263
environment: PyPI
281264
steps:
282265
-

0 commit comments

Comments
 (0)