diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 9771a6f8..af5596b5 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -7,10 +7,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: - max-parallel: 4 + max-parallel: 8 matrix: - python-version: [3.7, 3.8] - os: [ubuntu-20.04, macos-10.15] # , windows-2019] + python-version: [3.7, 3.8, 3.9] + os: [ubuntu-20.04, macos-10.15] + gdal: [3.0.4,3.1.0,3.2.0,3.3.0] steps: - uses: actions/checkout@v1 @@ -22,17 +23,18 @@ jobs: if: runner.os == 'Linux' run: | sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable - sudo apt-get install -y libproj-dev libgeos-dev libspatialite-dev libgdal-dev gdal-bin netcdf-bin + sudo apt-get install -y libproj-dev libgeos-dev libspatialite-dev libgdal-dev netcdf-bin + sudo apt-get install gdal-bin=${{matrix.gdal}} gdal-config --version - name: Install system dependencies (macOS) if: runner.os == 'macOS' run: | - brew install pkg-config gdal proj geos - gdal-config --version - - name: Install system dependencies (Windows) - if: runner.os == 'Windows' - run: | - nuget install GDAL -Version 2.4.4 + brew tap-new $USER/local-gdal + brew extract --version=${{matrix.gdal}} gdal $USER/local-gdal + brew install gdal@${{matrix.gdal}} + brew install pkg-config proj geos + gdal-config --version + - name: Install pygdal Python package (Ubuntu) if: runner.os == 'Linux' # see https://stackoverflow.com/a/17311033 @@ -44,11 +46,6 @@ jobs: if: runner.os == 'macOS' run: | pip install pygdal=="`gdal-config --version`.*" - - name: Install pygdal Python package (Windows) - # https://trac.osgeo.org/gdal/wiki/DownloadingGdalBinaries#Windows - if: runner.os == 'Windows' - run: | - pip install pygdal=="2.4.4.*" - name: Install dependencies run: | python -m pip install --upgrade pip @@ -59,4 +56,4 @@ jobs: - name: Test with pytest run: | pip install -r requirements-dev.txt - pytest \ No newline at end of file + pytest