Skip to content

Commit

Permalink
Merge release candidate 1.3.0rc1 into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@molinav
molinav committed Dec 24, 2021
2 parents 75c8c9e + f7d0ad2 commit fe84179
Show file tree
Hide file tree
Showing 16 changed files with 992 additions and 855 deletions.
44 changes: 44 additions & 0 deletions .github/actions/setup-msvc/action.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: "Setup MSVC"
description: "Setup Microsoft Visual C++ compiler"

inputs:
arch:
description: "Hardware architecture"
required: true
default: "x64"
version:
description: "Toolset version"
required: true
default: "16"

runs:
using: "composite"
steps:
-
name: Set MSVC toolchain (v9)
shell: pwsh
run: |
if (-not "${{ env.VS090URL }}") {
echo "Missing environment variable VS090URL"
exit 1;
}
Invoke-WebRequest ${{ env.VS090URL }} -OutFile VCForPython27.msi
(Start-Process "msiexec" -NoNewWindow -PassThru -ArgumentList `
"/i VCForPython27.msi /qn /l*! output.log").WaitForExit()
$MSVCVARS = "VCINSTALLDIR", "WindowsSdkDir", "PATH", "LIB", "LIBPATH", "INCLUDE"
$MSVCROOT = "C:\Users\$env:UserName\AppData\Local\Programs\Common\Microsoft\Visual C++ for Python\9.0"
cmd.exe /c "`"${MSVCROOT}\vcvarsall.bat`" ${{ inputs.arch }} && set" |
ForEach-Object {
$name, $value = $_ -split '=', 2
if (${MSVCVARS} -contains $name) {
echo $_ >> $env:GITHUB_ENV
}
}
if: inputs.version == '9'
-
name: Set MSVC toolchain (v14+)
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{ inputs.arch }}
toolset: ${{ inputs.version }}
if: inputs.version != '9'
15 changes: 3 additions & 12 deletions .github/workflows/basemap-data-hires.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ jobs:
-
name: Build wheel
run: |
set -e
. /etc/profile
cd ${{ env.PKGDIR }}
python setup.py sdist bdist_wheel --universal
-
Expand All @@ -53,7 +51,8 @@ jobs:
"3.8",
"3.9",
]
max-parallel: 5
max-parallel: 6
fail-fast: false
needs: build
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
Expand All @@ -70,14 +69,10 @@ jobs:
-
name: Install package
run: |
set -e
. /etc/profile
pip install ${{ env.PKGDIR }}/dist/*.whl
-
name: Test package
run: |
set -e
. /etc/profile
python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
upload:
Expand All @@ -92,7 +87,7 @@ jobs:
needs: test
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
environment: Test PyPI
environment: PyPI
steps:
-
name: Checkout
Expand All @@ -106,8 +101,6 @@ jobs:
-
name: Install requirements
run: |
set -e
. /etc/profile
pip install --prefer-binary twine
-
name: Upload distributables
Expand All @@ -116,8 +109,6 @@ jobs:
TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
run: |
set -e
. /etc/profile
python -m twine check \
${{ env.PKGDIR }}/dist/*.zip \
${{ env.PKGDIR }}/dist/*.whl
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/basemap-data.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ jobs:
-
name: Build wheel
run: |
set -e
. /etc/profile
cd ${{ env.PKGDIR }}
python setup.py sdist bdist_wheel --universal
-
Expand All @@ -53,7 +51,8 @@ jobs:
"3.8",
"3.9",
]
max-parallel: 5
max-parallel: 6
fail-fast: false
needs: build
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
Expand All @@ -70,14 +69,10 @@ jobs:
-
name: Install package
run: |
set -e
. /etc/profile
pip install ${{ env.PKGDIR }}/dist/*.whl
-
name: Test package
run: |
set -e
. /etc/profile
python -c "from mpl_toolkits import basemap_data; print(basemap_data)"
upload:
Expand All @@ -92,7 +87,7 @@ jobs:
needs: test
runs-on: ubuntu-latest
container: "pylegacy/python:${{ matrix.python-version }}-debian-5"
environment: Test PyPI
environment: PyPI
steps:
-
name: Checkout
Expand All @@ -106,8 +101,6 @@ jobs:
-
name: Install requirements
run: |
set -e
. /etc/profile
pip install --prefer-binary twine
-
name: Upload distributables
Expand All @@ -116,8 +109,6 @@ jobs:
TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
run: |
set -e
. /etc/profile
python -m twine check \
${{ env.PKGDIR }}/dist/*.zip \
${{ env.PKGDIR }}/dist/*.whl
Expand Down
32 changes: 2 additions & 30 deletions .github/workflows/basemap-for-manylinux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ jobs:
-
name: Install CMake 3.6.2
run: |
set -e
. /etc/profile
apt-get update
apt-get install -y libidn11
pkgvers=3.6.2
Expand All @@ -45,17 +43,13 @@ jobs:
-
name: Install GCC toolchain
run: |
set -e
. /etc/profile
apt-get update
apt-get install -y gcc g++ make
-
name: Build GEOS from source
run: |
set -e
. /etc/profile
cd ${{ env.PKGDIR }}
python -c "import utils; utils.GeosLibrary('3.6.5').build('extern', njobs=16)"
python -c "import utils; utils.GeosLibrary('3.5.1').build('extern', njobs=16)"
-
name: Upload GEOS artifacts
uses: actions/upload-artifact@v1
Expand Down Expand Up @@ -98,22 +92,16 @@ jobs:
-
name: Install GCC toolchain
run: |
set -e
. /etc/profile
apt-get update
apt-get install -y gcc g++ make
-
name: Install unzip
run: |
set -e
. /etc/profile
apt-get update
apt-get install -y unzip
-
name: Generate NumPy headers
run: |
set -e
. /etc/profile
case "${{ matrix.python-version }}" in
2.[67]|3.[01234]) pkgvers=1.11.3;;
*) pkgvers=1.16.6;;
Expand All @@ -132,8 +120,6 @@ jobs:
-
name: Build wheel
run: |
set -e
. /etc/profile
cd ${{ env.PKGDIR }}
export GEOS_DIR=extern
export NUMPY_INCLUDE_PATH=extern/include
Expand Down Expand Up @@ -187,22 +173,16 @@ jobs:
-
name: Install GCC toolchain
run: |
set -e
. /etc/profile
apt-get update
apt-get install -y gcc g++ make
-
name: Install unzip
run: |
set -e
. /etc/profile
apt-get update
apt-get install -y unzip
-
name: Install patchelf from source
run: |
set -e
. /etc/profile
pkgvers=0.9
pkgname=patchelf
pkgcode=${pkgname}-${pkgvers}
Expand All @@ -220,14 +200,10 @@ jobs:
-
name: Install auditwheel
run: |
set -e
. /etc/profile
pip install "auditwheel < 4.0"
-
name: Repair wheel
run: |
set -e
. /etc/profile
cd ${{ env.PKGDIR }}
export LD_LIBRARY_PATH="$(readlink -f extern/lib)"
auditwheel repair -w dist dist/*.whl
Expand Down Expand Up @@ -260,7 +236,7 @@ jobs:
needs: repair
runs-on: ubuntu-latest
container: "pylegacy/${{ matrix.arch }}-python:${{ matrix.python-version }}-debian-5"
environment: Test PyPI
environment: PyPI
steps:
-
name: Checkout
Expand All @@ -274,8 +250,6 @@ jobs:
-
name: Install requirements
run: |
set -e
. /etc/profile
pip install --prefer-binary twine
-
name: Upload distributables
Expand All @@ -284,8 +258,6 @@ jobs:
TWINE_PASSWORD: "${{ secrets.PYPI_TOKEN }}"
TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
run: |
set -e
. /etc/profile
python -m twine check \
${{ env.PKGDIR }}/dist/*.zip \
${{ env.PKGDIR }}/dist/*-manylinux1*.whl
Expand Down
Loading

0 comments on commit fe84179

Please sign in to comment.