diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 27e3f45a..773db229 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -51,7 +51,6 @@ jobs: condarc: | channels: - conda-forge - # temporarily capping numpy<2 until we figure out build issues with gdal>=3.8 create-args: >- python=${{ matrix.python-version }} gdal=${{ matrix.gdal }} @@ -59,7 +58,7 @@ jobs: python-build flake8 pytest - numpy<2 + numpy environment-name: pyenv - name: Lint with flake8 diff --git a/pyproject.toml b/pyproject.toml index 88df906e..66bc9863 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,9 @@ dynamic = ["version", "dependencies", "optional-dependencies", "readme"] # that we can provide a much easier build experience so long as GDAL is # available at runtime. requires = [ - 'setuptools', 'wheel', 'setuptools_scm', 'cython>=3.0.0', 'oldest-supported-numpy' + 'setuptools', 'wheel', 'setuptools_scm', 'cython>=3.0.0', + 'oldest-supported-numpy; python_version<="3.8"', + 'numpy>=2; python_version>="3.9"', # Numpy 2 only available for 3.9+ ] build-backend = "setuptools.build_meta"