Skip to content

Commit cbbc2e4

Browse files
molinavmolinav
committed
Merge branch 'hotfix-1.3.2'
2 parents 60bc19d + 0981b58 commit cbbc2e4

28 files changed

+324
-257
lines changed

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ jobs:
4646
name: checkout
4747
path: .
4848
-
49-
name: Build wheel
49+
name: Build sdist and wheel
5050
run: |
5151
cd ${{ env.PKGDIR }}
52-
python setup.py sdist bdist_wheel --universal
52+
python setup.py sdist
53+
pip wheel -w dist --no-deps dist/*.zip
5354
-
5455
name: Upload build artifacts
5556
uses: actions/upload-artifact@v1

‎.github/workflows/basemap-data.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ jobs:
4646
name: checkout
4747
path: .
4848
-
49-
name: Build wheel
49+
name: Build sdist and wheel
5050
run: |
5151
cd ${{ env.PKGDIR }}
52-
python setup.py sdist bdist_wheel --universal
52+
python setup.py sdist
53+
pip wheel -w dist --no-deps dist/*.zip
5354
-
5455
name: Upload build artifacts
5556
uses: actions/upload-artifact@v1

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

+7-22
Original file line numberDiff line numberDiff line change
@@ -109,38 +109,23 @@ jobs:
109109
apt-get update
110110
apt-get install -y gcc g++ make
111111
-
112-
name: Install unzip
113-
run: |
114-
apt-get update
115-
apt-get install -y unzip
116-
-
117-
name: Generate NumPy headers
112+
name: Build old numpy from source
118113
run: |
119114
case "${{ matrix.python-version }}" in
120115
2.6|3.[23]) pkgvers=1.11.3;;
121116
2.7|3.[456789]) pkgvers=1.16.6;;
122117
*) pkgvers=1.21.4;;
123118
esac
124-
pkgname=numpy
125-
pkgcode=numpy-${pkgvers}
126-
python -m pip install cython
127-
python -m pip download --no-binary=numpy "numpy == ${pkgvers}"
128-
unzip ${pkgcode}.zip
129-
rm -f ${pkgcode}.zip
130-
cd ${pkgcode}
131-
python setup.py build
132-
cp build/src*/numpy/core/include/numpy/*.h numpy/core/include/numpy/
133-
cd ..
134-
cp -R ${pkgcode}/numpy/core/include ${{ env.PKGDIR }}/extern
135-
rm -rf ${pkgcode}
119+
pip install "numpy == ${pkgvers}"
136120
-
137121
name: Build wheel
138122
run: |
123+
sitepkgdir=$(pip show numpy 2>/dev/null | grep Location: | cut -d' ' -f2)
124+
export GEOS_DIR="${GITHUB_WORKSPACE}/${{ env.PKGDIR }}/extern"
125+
export NUMPY_INCLUDE_PATH=${sitepkgdir}/numpy/core/include
139126
cd ${{ env.PKGDIR }}
140-
export GEOS_DIR=extern
141-
export NUMPY_INCLUDE_PATH=extern/include
142-
pip install -r requirements-setup.txt
143-
python setup.py sdist bdist_wheel
127+
python setup.py sdist
128+
pip wheel -w dist --no-deps dist/*.zip
144129
-
145130
name: Upload build artifacts
146131
uses: actions/upload-artifact@v1

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

+27-46
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,22 @@ jobs:
6161
name: checkout
6262
path: .
6363
-
64-
name: Set Python
65-
uses: actions/setup-python@v2
66-
with:
67-
architecture: ${{ matrix.arch }}
68-
python-version: "3.6"
69-
-
70-
name: Setup MSVC toolset
64+
name: Set MSVC toolset
7165
uses: pylegacy/actions/setup-msvc@v1
7266
with:
7367
architecture: ${{ matrix.arch }}
7468
version: ${{ matrix.msvc-toolset }}
7569
-
76-
name: Install CMake
70+
name: Set CMake
7771
uses: jwlawson/[email protected]
7872
with:
7973
cmake-version: ${{ matrix.cmake-version }}
74+
-
75+
name: Set Python
76+
uses: actions/setup-python@v2
77+
with:
78+
architecture: ${{ matrix.arch }}
79+
python-version: "3.6"
8080
-
8181
name: Build GEOS from source
8282
run: |
@@ -107,12 +107,6 @@ jobs:
107107
with:
108108
name: checkout
109109
path: .
110-
-
111-
name: Set Python
112-
uses: actions/setup-python@v2
113-
with:
114-
architecture: ${{ matrix.arch }}
115-
python-version: ${{ matrix.python-version }}
116110
-
117111
name: Set MSVC toolset version
118112
run: |
@@ -122,52 +116,45 @@ jobs:
122116
echo "msvc-toolset=14.16" >> $env:GITHUB_ENV
123117
}
124118
-
125-
name: Setup MSVC toolset
119+
name: Set MSVC toolset
126120
uses: pylegacy/actions/setup-msvc@v1
127121
with:
128122
architecture: ${{ matrix.arch }}
129123
version: ${{ env.msvc-toolset }}
130124
-
131-
name: Install Python base packages
125+
name: Set Python
126+
uses: actions/setup-python@v2
127+
with:
128+
architecture: ${{ matrix.arch }}
129+
python-version: ${{ matrix.python-version }}
130+
-
131+
name: Set Python base packages
132132
run: |
133133
python -m pip install --upgrade pip setuptools wheel
134134
-
135-
name: Generate NumPy headers
135+
name: Build old numpy from source
136136
run: |
137-
if ("${{ matrix.python-version }}" -In "2.6", "3.2", "3.3") {
138-
Set-Variable -Name "pkgvers" -Value "1.11.3"
139-
} elseif ("${{ matrix.python-version }}" -In "2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9") {
140-
Set-Variable -Name "pkgvers" -Value "1.16.6"
141-
} else {
142-
Set-Variable -Name "pkgvers" -Value "1.21.4"
137+
Switch -regex ("${{ matrix.python-version }}") {
138+
"^2\.6|3\.[123]$" { Set-Variable -Name "pkgvers" -Value "1.11.3" }
139+
"^2\.7|3\.[456789]$" { Set-Variable -Name "pkgvers" -Value "1.16.6" }
140+
default { Set-Variable -Name "pkgvers" -Value "1.21.4" }
143141
}
144-
Set-Variable -Name "pkgname" -Value "numpy"
145-
Set-Variable -Name "pkgcode" -Value "numpy-${pkgvers}"
146-
Set-Variable -Name "includedir" -Value "numpy/core/include"
147-
python -m pip install cython
148-
python -m pip download --no-binary=numpy "numpy == ${pkgvers}"
149-
tar -xf "${pkgcode}.zip"
150-
rm "${pkgcode}.zip"
151-
cd "${pkgcode}"
152-
python setup.py build
153-
cp -R build/src.*/${includedir}/numpy/*.h ${includedir}/numpy
154-
cd ..
155-
cp -R "${pkgcode}/${includedir}/numpy" "${{ env.PKGDIR }}/extern/include/numpy"
156-
rm -r "${pkgcode}"
142+
$env:SETUPTOOLS_USE_DISTUTILS = "stdlib"
143+
python -m pip install "numpy == ${pkgvers}"
157144
-
158145
name: Download GEOS artifacts
159146
uses: actions/download-artifact@v1
160147
with:
161148
name: artifacts-geos-${{ matrix.arch }}-msvc${{ env.msvc-toolset }}
162149
path: ${{ env.PKGDIR }}/extern
163150
-
164-
name: Build wheel
151+
name: Build sdist and wheel
165152
run: |
166153
cd ${{ env.PKGDIR }}
167-
$env:GEOS_DIR = "extern"
168-
$env:NUMPY_INCLUDE_PATH = "extern/include"
154+
$env:GEOS_DIR = "$env:GITHUB_WORKSPACE/${{ env.PKGDIR }}/extern"
169155
pip install -r requirements-setup.txt
170-
python setup.py sdist bdist_wheel
156+
python setup.py sdist
157+
pip wheel -w dist --no-deps (Get-Item dist/*.zip)
171158
-
172159
name: Upload build artifacts
173160
uses: actions/upload-artifact@v1
@@ -187,12 +174,6 @@ jobs:
187174
needs: build
188175
runs-on: windows-latest
189176
steps:
190-
-
191-
name: Download checkout
192-
uses: actions/download-artifact@v1
193-
with:
194-
name: checkout
195-
path: .
196177
-
197178
name: Set Python
198179
uses: actions/setup-python@v2

‎.gitignore

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
1+
.eggs
12
build
23
dist
3-
.eggs
44
*.egg-info
55
*.pyc
66
*.pyd
77
*.so
8-
*.c
9-
10-
doc/build
11-
doc/source/_autosummary
128

139
htmlcov
10+
.cache
1411
.coverage
1512
.pytest_cache
1613

14+
# File manager files.
1715
.gdb_history
1816
.DS_Store
1917
.DS_Store?
2018
ehthumbs.db
2119
Icon?
2220
Thumbs.db
2321

22+
# Temporary files.
2423
.#*
2524
[#]*#
2625
*~
2726
*$
2827
*.bak
28+
29+
# IDE files.
2930
.project
3031
.pydevproject
3132
.vscode
3233

3334
# Things specific to this project.
34-
examples/*.png
3535
*.pickle
36-
doc/examples
37-
doc/_templates/gallery.html
38-
doc/users/installing.rst
39-
doc/_static/matplotlibrc
36+
examples/*.png
37+
packages/basemap/doc/examples
38+
packages/basemap/doc/users/installing.rst
39+
packages/basemap/doc/_static/matplotlibrc
40+
packages/basemap/doc/_templates/gallery.html

0 commit comments

Comments
 (0)