Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nens/threedigrid-builder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 379db4982e2549ff49b51599b592424946417f53
Choose a base ref
..
head repository: nens/threedigrid-builder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 257e6cd24db8126389b582c2395a05d2651a975c
Choose a head ref
Showing with 6 additions and 14 deletions.
  1. +4 −12 .github/workflows/test.yml
  2. +1 −1 pyproject.toml
  3. +1 −1 setup.py
16 changes: 4 additions & 12 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -18,56 +18,49 @@ jobs:
# 2018
- python: 3.7
os: ubuntu-20.04
setuptools: setuptools==63.*
numpy: numpy==1.15.*
display_name: "2018"
pins: "h5py==2.9.* sqlalchemy==1.4.1 shapely==2.0.* pyproj==3.0.*"
extras: "[test,gridadmin]"
# 2019
- python: 3.8
os: ubuntu-20.04
setuptools: setuptools==63.*
numpy: numpy==1.17.*
display_name: "2019"
pins: "h5py==2.10.* sqlalchemy==1.4.10 shapely==2.0.* pyproj==3.0.*"
extras: "[test,gridadmin]"
# 2020
- python: 3.9
os: ubuntu-20.04
setuptools: setuptools==63.*
numpy: numpy==1.19.*
display_name: "2020"
pins: "h5py==3.1.* sqlalchemy==1.4.20 shapely==2.0.* pyproj==3.0.*"
extras: "[test,gridadmin]"
# 2021
- python: 3.9
os: ubuntu-20.04
setuptools: setuptools==63.*
numpy: numpy==1.21.*
display_name: "2021"
pins: "h5py==3.3.* sqlalchemy==1.4.30 shapely==2.0.* pyproj==3.2.*"
extras: "[test,gridadmin]"
# 2022
- python: '3.10'
os: ubuntu-22.04
setuptools: setuptools==63.*
numpy: numpy==1.23.*
display_name: "2022"
pins: "h5py==3.7.* sqlalchemy==1.4.40 shapely==2.0.* pyproj==3.4.*"
extras: "[test,gridadmin]"
# 2023
- python: '3.11'
os: ubuntu-22.04
setuptools: setuptools==63.*
numpy: numpy==1.24.*
pins: "h5py==3.10.* sqlalchemy==2.0.* shapely==2.0.* pyproj==3.6.*"
display_name: "2023"
extras: "[test,gridadmin]"
# current (still using 3.11 because 3.12 breaks; see issue 348)
- python: '3.12'
- python: '3.11'
os: ubuntu-latest
setuptools: setuptools==69.*
numpy: numpy==1.26.*
numpy: numpy==1.24.*
pins: ""
display_name: "latest"
extras: "[test,gridadmin]"
@@ -96,10 +89,9 @@ jobs:
- name: Install python dependencies
shell: bash
run: |
pip install --disable-pip-version-check --upgrade pip wheel scikit-build
pip install ${{ matrix.setuptools }}
pip install --disable-pip-version-check --upgrade pip setuptools==63.* wheel scikit-build
pip install ${{ matrix.numpy }}
pip install -v -e .${{matrix.extras }} --no-build-isolation ${{ matrix.pins }} "pygdal==$(gdal-config --version).*"
pip install -e .${{ matrix.extras }} --no-build-isolation ${{ matrix.pins }} "pygdal==$(gdal-config --version).*"
pip list
- name: Run unittests
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,6 @@ requires = [
"numpy==1.21.3; python_version=='3.10'",
"numpy==1.24.2; python_version=='3.11'",
# do not pin numpy on future versions of python to avoid incompatible numpy and python versions
"numpy==1.26.*; python_version=='3.12'",
"numpy; python_version>='3.11'",
"ninja; platform_system!='Windows'"
]
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ def get_version():


install_requires = [
"numpy>=1.15",
"numpy>=1.15,<1.25.0",
"threedi-schema==0.219.*",
"shapely>=2",
"pyproj>=3",