Skip to content

Commit

Permalink
Merge branch 'release-1.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@molinav
molinav committed Jan 22, 2022
2 parents 41d7117 + 438dea7 commit 9389196
Show file tree
Hide file tree
Showing 113 changed files with 185 additions and 261 deletions.
44 changes: 0 additions & 44 deletions .github/actions/setup-msvc/action.yml
View file

This file was deleted.

31 changes: 12 additions & 19 deletions .github/workflows/basemap-data-hires.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ env:

on:
push:
paths:
- ".github/workflows/basemap-data-hires.yml"
- "packages/basemap_data_hires/**"
pull_request:
paths:
- ".github/workflows/basemap-data-hires.yml"
- "packages/basemap_data_hires/**"
workflow_dispatch:

jobs:
Expand All @@ -26,13 +33,11 @@ jobs:
strategy:
matrix:
python-version:
[
"2.7",
]
["2.7"]
max-parallel: 1
needs: checkout
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
steps:
-
name: Download checkout
Expand All @@ -56,18 +61,8 @@ jobs:
strategy:
matrix:
python-version:
[
"2.6",
"2.7",
"3.2",
"3.3",
"3.4",
"3.5",
"3.6",
"3.7",
"3.8",
"3.9",
]
["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
"3.9", "3.10"]
max-parallel: 3
fail-fast: false
needs: build
Expand Down Expand Up @@ -99,9 +94,7 @@ jobs:
strategy:
matrix:
python-version:
[
"2.7",
]
["2.7"]
max-parallel: 1
if: startsWith(github.event.ref, 'refs/tags/v')
needs: test
Expand Down
31 changes: 12 additions & 19 deletions .github/workflows/basemap-data.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ env:

on:
push:
paths:
- ".github/workflows/basemap-data.yml"
- "packages/basemap_data/**"
pull_request:
paths:
- ".github/workflows/basemap-data.yml"
- "packages/basemap_data/**"
workflow_dispatch:

jobs:
Expand All @@ -26,13 +33,11 @@ jobs:
strategy:
matrix:
python-version:
[
"2.7",
]
["2.7"]
max-parallel: 1
needs: checkout
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-4"
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
steps:
-
name: Download checkout
Expand All @@ -56,18 +61,8 @@ jobs:
strategy:
matrix:
python-version:
[
"2.6",
"2.7",
"3.2",
"3.3",
"3.4",
"3.5",
"3.6",
"3.7",
"3.8",
"3.9",
]
["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8",
"3.9", "3.10"]
max-parallel: 3
fail-fast: false
needs: build
Expand Down Expand Up @@ -99,9 +94,7 @@ jobs:
strategy:
matrix:
python-version:
[
"2.7",
]
["2.7"]
max-parallel: 1
if: startsWith(github.event.ref, 'refs/tags/v')
needs: test
Expand Down
134 changes: 33 additions & 101 deletions .github/workflows/basemap-for-manylinux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ env:

on:
push:
paths:
- ".github/workflows/basemap-for-manylinux.yml"
- "packages/basemap/**"
pull_request:
paths:
- ".github/workflows/basemap-for-manylinux.yml"
- "packages/basemap/**"
workflow_dispatch:

jobs:
Expand All @@ -26,10 +33,7 @@ jobs:
strategy:
matrix:
arch:
[
"x64",
"x86",
]
["x64", "x86"]
max-parallel: 2
fail-fast: false
needs: checkout
Expand Down Expand Up @@ -78,19 +82,9 @@ jobs:
strategy:
matrix:
arch:
[
"x64",
"x86",
]
["x64", "x86"]
python-version:
[
"2.7",
"3.5",
"3.6",
"3.7",
"3.8",
"3.9",
]
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
max-parallel: 3
fail-fast: false
needs: build-geos
Expand Down Expand Up @@ -123,12 +117,14 @@ jobs:
name: Generate NumPy headers
run: |
case "${{ matrix.python-version }}" in
2.[67]|3.[01234]) pkgvers=1.11.3;;
*) pkgvers=1.16.6;;
2.6|3.[23]) pkgvers=1.11.3;;
2.7|3.[456789]) pkgvers=1.16.6;;
*) pkgvers=1.21.4;;
esac
pkgname=numpy
pkgcode=numpy-${pkgvers}
python -m pip download --no-binary=:all: "numpy == ${pkgvers}"
python -m pip install cython
python -m pip download --no-binary=numpy "numpy == ${pkgvers}"
unzip ${pkgcode}.zip
rm -f ${pkgcode}.zip
cd ${pkgcode}
Expand Down Expand Up @@ -156,24 +152,14 @@ jobs:
strategy:
matrix:
arch:
[
"x64",
"x86",
]
["x64", "x86"]
python-version:
[
"2.7",
"3.5",
"3.6",
"3.7",
"3.8",
"3.9",
]
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
max-parallel: 3
fail-fast: false
needs: build
runs-on: ubuntu-latest
container: "pylegacy/${{ matrix.arch }}-python:3.6-debian-5"
container: "pylegacy/${{ matrix.arch }}-python:3.6-debian-8"
steps:
-
name: Download GEOS artifacts
Expand All @@ -187,33 +173,16 @@ jobs:
with:
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
path: ${{ env.PKGDIR }}/dist
-
name: Install GCC toolchain
run: |
apt-get update
apt-get install -y gcc g++ make
-
name: Install unzip
run: |
apt-get update
apt-get install -y unzip
-
name: Install patchelf from source
name: Install patchelf
run: |
pkgvers=0.9
pkgname=patchelf
pkgcode=${pkgname}-${pkgvers}
cd /tmp
wget https://releases.nixos.org/${pkgname}/${pkgcode}/${pkgcode}.tar.gz
tar -xf ${pkgcode}.tar.gz
rm -f ${pkgcode}.tar.gz
cd ${pkgcode}
./configure
make
make check
make install
cd ..
rm -rf ${pkgcode}
pip install patchelf
alias patchelf="python -m patchelf"
-
name: Install auditwheel
run: |
Expand All @@ -235,24 +204,14 @@ jobs:
strategy:
matrix:
arch:
[
"x64",
"x86",
]
["x64", "x86"]
python-version:
[
"2.7",
"3.5",
"3.6",
"3.7",
"3.8",
"3.9",
]
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
max-parallel: 3
fail-fast: false
needs: repair
runs-on: ubuntu-latest
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-5"
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-8"
steps:
-
name: Download checkout
Expand All @@ -266,37 +225,20 @@ jobs:
with:
name: artifacts-build-${{ matrix.arch }}-${{ matrix.python-version }}
path: ${{ env.PKGDIR }}/dist
-
name: Install GCC toolchain
run: |
apt-get update
apt-get install -y gcc g++ make
-
name: Install matplotlib dependencies
run: |
apt-get update
apt-get install -y libfreetype6-dev libpng12-dev
apt-get install -y gcc g++ make
apt-get install -y pkg-config libfreetype6-dev libpng12-dev
if: matrix.arch == 'x86' && matrix.python-version == '3.5'
-
name: Install pyproj manually
name: Install numpy from source
run: |
apt-get update
apt-get install -y proj-bin libproj-dev
python -m pip install cython
pkgname=pyproj
pkgvers=${{ env.pyproj-version }}
pkgcode=${pkgname}-${pkgvers}
python -m pip download "pyproj == ${pkgvers}"
tar -xf ${pkgcode}.tar.gz
rm -rf ${pkgcode}.tar.gz
cd ${pkgcode}
rm _proj.c
python -m pip install .
cd ..
rm -rf ${pkgcode}
if: matrix.python-version == '3.9'
env:
pyproj-version: 1.9.6
apt-get install -y gcc g++ make
pip install "numpy < 1.21.5"
if: matrix.arch == 'x86' && matrix.python-version == '3.10'
-
name: Install package
run: |
Expand All @@ -310,24 +252,14 @@ jobs:
strategy:
matrix:
arch:
[
"x64",
"x86",
]
["x64", "x86"]
python-version:
[
"2.7",
"3.5",
"3.6",
"3.7",
"3.8",
"3.9",
]
["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
max-parallel: 1
if: startsWith(github.event.ref, 'refs/tags/v')
needs: test
runs-on: ubuntu-latest
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-5"
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-8"
environment: PyPI
steps:
-
Expand Down
Loading

0 comments on commit 9389196

Please sign in to comment.