Skip to content

Commit fe84179

Browse files
molinavmolinav
committed
Merge release candidate 1.3.0rc1 into master
2 parents 75c8c9e + f7d0ad2 commit fe84179

16 files changed

Lines changed: 992 additions & 855 deletions

File tree

‎.github/actions/setup-msvc/action.yml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: "Setup MSVC"
2+
description: "Setup Microsoft Visual C++ compiler"
3+
4+
inputs:
5+
arch:
6+
description: "Hardware architecture"
7+
required: true
8+
default: "x64"
9+
version:
10+
description: "Toolset version"
11+
required: true
12+
default: "16"
13+
14+
runs:
15+
using: "composite"
16+
steps:
17+
-
18+
name: Set MSVC toolchain (v9)
19+
shell: pwsh
20+
run: |
21+
if (-not "${{ env.VS090URL }}") {
22+
echo "Missing environment variable VS090URL"
23+
exit 1;
24+
}
25+
Invoke-WebRequest ${{ env.VS090URL }} -OutFile VCForPython27.msi
26+
(Start-Process "msiexec" -NoNewWindow -PassThru -ArgumentList `
27+
"/i VCForPython27.msi /qn /l*! output.log").WaitForExit()
28+
$MSVCVARS = "VCINSTALLDIR", "WindowsSdkDir", "PATH", "LIB", "LIBPATH", "INCLUDE"
29+
$MSVCROOT = "C:\Users\$env:UserName\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0"
30+
cmd.exe /c "`"${MSVCROOT}\vcvarsall.bat`" ${{ inputs.arch }} && set" |
31+
ForEach-Object {
32+
$name, $value = $_ -split '=', 2
33+
if (${MSVCVARS} -contains $name) {
34+
echo $_ >> $env:GITHUB_ENV
35+
}
36+
}
37+
if: inputs.version == '9'
38+
-
39+
name: Set MSVC toolchain (v14+)
40+
uses: ilammy/msvc-dev-cmd@v1
41+
with:
42+
arch: ${{ inputs.arch }}
43+
toolset: ${{ inputs.version }}
44+
if: inputs.version != '9'

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
-
2727
name: Build wheel
2828
run: |
29-
set -e
30-
. /etc/profile
3129
cd ${{ env.PKGDIR }}
3230
python setup.py sdist bdist_wheel --universal
3331
-
@@ -53,7 +51,8 @@ jobs:
5351
"3.8",
5452
"3.9",
5553
]
56-
max-parallel: 5
54+
max-parallel: 6
55+
fail-fast: false
5756
needs: build
5857
runs-on: ubuntu-latest
5958
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
@@ -70,14 +69,10 @@ jobs:
7069
-
7170
name: Install package
7271
run: |
73-
set -e
74-
. /etc/profile
7572
pip install ${{ env.PKGDIR }}/dist/*.whl
7673
-
7774
name: Test package
7875
run: |
79-
set -e
80-
. /etc/profile
8176
python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
8277
8378
upload:
@@ -92,7 +87,7 @@ jobs:
9287
needs: test
9388
runs-on: ubuntu-latest
9489
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
95-
environment: Test PyPI
90+
environment: PyPI
9691
steps:
9792
-
9893
name: Checkout
@@ -106,8 +101,6 @@ jobs:
106101
-
107102
name: Install requirements
108103
run: |
109-
set -e
110-
. /etc/profile
111104
pip install --prefer-binary twine
112105
-
113106
name: Upload distributables
@@ -116,8 +109,6 @@ jobs:
116109
TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
117110
TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
118111
run: |
119-
set -e
120-
. /etc/profile
121112
python -m twine check \
122113
${{ env.PKGDIR }}/dist/*.zip \
123114
${{ env.PKGDIR }}/dist/*.whl

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
-
2727
name: Build wheel
2828
run: |
29-
set -e
30-
. /etc/profile
3129
cd ${{ env.PKGDIR }}
3230
python setup.py sdist bdist_wheel --universal
3331
-
@@ -53,7 +51,8 @@ jobs:
5351
"3.8",
5452
"3.9",
5553
]
56-
max-parallel: 5
54+
max-parallel: 6
55+
fail-fast: false
5756
needs: build
5857
runs-on: ubuntu-latest
5958
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
@@ -70,14 +69,10 @@ jobs:
7069
-
7170
name: Install package
7271
run: |
73-
set -e
74-
. /etc/profile
7572
pip install ${{ env.PKGDIR }}/dist/*.whl
7673
-
7774
name: Test package
7875
run: |
79-
set -e
80-
. /etc/profile
8176
python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
8277
8378
upload:
@@ -92,7 +87,7 @@ jobs:
9287
needs: test
9388
runs-on: ubuntu-latest
9489
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
95-
environment: Test PyPI
90+
environment: PyPI
9691
steps:
9792
-
9893
name: Checkout
@@ -106,8 +101,6 @@ jobs:
106101
-
107102
name: Install requirements
108103
run: |
109-
set -e
110-
. /etc/profile
111104
pip install --prefer-binary twine
112105
-
113106
name: Upload distributables
@@ -116,8 +109,6 @@ jobs:
116109
TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
117110
TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
118111
run: |
119-
set -e
120-
. /etc/profile
121112
python -m twine check \
122113
${{ env.PKGDIR }}/dist/*.zip \
123114
${{ env.PKGDIR }}/dist/*.whl

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

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
-
2929
name: Install CMake 3.6.2
3030
run: |
31-
set -e
32-
. /etc/profile
3331
apt-get update
3432
apt-get install -y libidn11
3533
pkgvers=3.6.2
@@ -45,17 +43,13 @@ jobs:
4543
-
4644
name: Install GCC toolchain
4745
run: |
48-
set -e
49-
. /etc/profile
5046
apt-get update
5147
apt-get install -y gcc g++ make
5248
-
5349
name: Build GEOS from source
5450
run: |
55-
set -e
56-
. /etc/profile
5751
cd ${{ env.PKGDIR }}
58-
python -c "import utils; utils.GeosLibrary('3.6.5').build('extern', njobs=16)"
52+
python -c "import utils; utils.GeosLibrary('3.5.1').build('extern', njobs=16)"
5953
-
6054
name: Upload GEOS artifacts
6155
uses: actions/upload-artifact@v1
@@ -98,22 +92,16 @@ jobs:
9892
-
9993
name: Install GCC toolchain
10094
run: |
101-
set -e
102-
. /etc/profile
10395
apt-get update
10496
apt-get install -y gcc g++ make
10597
-
10698
name: Install unzip
10799
run: |
108-
set -e
109-
. /etc/profile
110100
apt-get update
111101
apt-get install -y unzip
112102
-
113103
name: Generate NumPy headers
114104
run: |
115-
set -e
116-
. /etc/profile
117105
case "${{ matrix.python-version }}" in
118106
2.[67]|3.[01234]) pkgvers=1.11.3;;
119107
*) pkgvers=1.16.6;;
@@ -132,8 +120,6 @@ jobs:
132120
-
133121
name: Build wheel
134122
run: |
135-
set -e
136-
. /etc/profile
137123
cd ${{ env.PKGDIR }}
138124
export GEOS_DIR=extern
139125
export NUMPY_INCLUDE_PATH=extern/include
@@ -187,22 +173,16 @@ jobs:
187173
-
188174
name: Install GCC toolchain
189175
run: |
190-
set -e
191-
. /etc/profile
192176
apt-get update
193177
apt-get install -y gcc g++ make
194178
-
195179
name: Install unzip
196180
run: |
197-
set -e
198-
. /etc/profile
199181
apt-get update
200182
apt-get install -y unzip
201183
-
202184
name: Install patchelf from source
203185
run: |
204-
set -e
205-
. /etc/profile
206186
pkgvers=0.9
207187
pkgname=patchelf
208188
pkgcode=${pkgname}-${pkgvers}
@@ -220,14 +200,10 @@ jobs:
220200
-
221201
name: Install auditwheel
222202
run: |
223-
set -e
224-
. /etc/profile
225203
pip install "auditwheel < 4.0"
226204
-
227205
name: Repair wheel
228206
run: |
229-
set -e
230-
. /etc/profile
231207
cd ${{ env.PKGDIR }}
232208
export LD_LIBRARY_PATH="$(readlink -f extern/lib)"
233209
auditwheel repair -w dist dist/*.whl
@@ -260,7 +236,7 @@ jobs:
260236
needs: repair
261237
runs-on: ubuntu-latest
262238
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-5"
263-
environment: Test PyPI
239+
environment: PyPI
264240
steps:
265241
-
266242
name: Checkout
@@ -274,8 +250,6 @@ jobs:
274250
-
275251
name: Install requirements
276252
run: |
277-
set -e
278-
. /etc/profile
279253
pip install --prefer-binary twine
280254
-
281255
name: Upload distributables
@@ -284,8 +258,6 @@ jobs:
284258
TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
285259
TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
286260
run: |
287-
set -e
288-
. /etc/profile
289261
python -m twine check \
290262
${{ env.PKGDIR }}/dist/*.zip \
291263
${{ env.PKGDIR }}/dist/*-manylinux1*.whl

0 commit comments

Comments
 (0)