Adding numpy version cap. RE:#386

natcap · Jun 21, 2024 · eaedc96 · eaedc96
2 parents d645b70 + 0622c75
commit eaedc96
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 39 deletions.
diff --git a/.github/workflows/build-py-dists.yml b/.github/workflows/build-py-dists.yml
@@ -8,8 +8,7 @@ jobs:
             fail-fast: false
             matrix:
                 os: [windows-latest, macos-latest]
-                python-version: [3.7, 3.8, 3.9, "3.10", "3.11", "3.12"]
-                python-arch: [x64]
+                python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
 
         steps:
             - uses: actions/checkout@v4
@@ -20,11 +19,10 @@ jobs:
             - name: Fetch git tags
               run: git fetch origin +refs/tags/*:refs/tags/*
 
-            - name: Set up python ${{ matrix.python-version }} ${{ matrix.python-arch }}
+            - name: Set up python ${{ matrix.python-version }}
               uses: actions/setup-python@v5
               with:
                   python-version: ${{ matrix.python-version }}
-                  architecture: ${{ matrix.python-arch }}
 
             - name: Install dependencies
               run: python -m pip install build
@@ -34,7 +32,7 @@ jobs:
 
             - uses: actions/upload-artifact@v1
               with:
-                  name: Wheel for ${{ matrix.os }} ${{ matrix.python-version }} ${{ matrix.python-arch }}
+                  name: Wheel for ${{ matrix.os }} ${{ matrix.python-version }}
                   path: dist
 
     build-sdist:
@@ -52,7 +50,7 @@ jobs:
             - name: Set up python
               uses: actions/setup-python@v5
               with:
-                  python-version: 3.7
+                  python-version: 3.12
 
             - name: Install dependencies
               run: python -m pip install build

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,17 +1,19 @@
 Release History
 ===============
 
-Unreleased Changes
+2.4.4 (2024-05-21)
 ------------------
 * Our github actions for building python distributions now use
   `actions/setup-python@v5`, which uses node 20.
   https://github.com/natcap/pygeoprocessing/issues/384
-* ``warp_raster`` and ``build_overviews`` no longer raise ``ValueError``s if
+* ``warp_raster`` and ``build_overviews`` no longer raise a ``ValueError`` if
   called with an invalid resampling algorithm. We now fall back to the
   underlying GDAL functions' error messages.
   https://github.com/natcap/pygeoprocessing/issues/387
 * Implementing decaying flow accumulation for D8 routing.
   https://github.com/natcap/pygeoprocessing/issues/386
+* Updated to Cython 3.
+* Dropped support for Python 3.7.
 
 2.4.3 (2024-03-06)
 ------------------

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,36 @@
+[project]
+name = "pygeoprocessing"
+description = "PyGeoprocessing: Geoprocessing routines for GIS"
+requires-python = ">=3.6"
+license = {file = "LICENSE.txt"}
+maintainers = [
+    {name = "Natural Capital Project Software Team"}
+]
+keywords = ['gis', 'geoprocessing', 'pygeoprocessing']
+classifiers = [
+    'Intended Audience :: Developers',
+    'Development Status :: 5 - Production/Stable',
+    'Intended Audience :: Science/Research',
+    'Natural Language :: English',
+    'Operating System :: MacOS :: MacOS X',
+    'Operating System :: Microsoft',
+    'Operating System :: POSIX',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: Implementation :: CPython',
+    'Topic :: Scientific/Engineering :: GIS',
+    'License :: OSI Approved :: BSD License'
+]
+# the version is provided dynamically by setuptools_scm
+# `dependencies` and `optional-dependencies` are provided by setuptools
+# using the corresponding setup args `install_requires` and `extras_require`
+# `readme` is provided by setuptools using the corresponding setup arg `long_description`
+dynamic = ["version", "dependencies", "optional-dependencies", "readme"]
+
+
 [build-system]
 # these are the minimum packages needed in order to execute the pygeoprocessing build.
 # Setuptools, wheel are from pep508.
@@ -6,7 +39,7 @@
 # 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'
 ]
 build-backend = "setuptools.build_meta"
 

diff --git a/requirements.txt b/requirements.txt
@@ -2,9 +2,8 @@
 # --------------------
 # This file records the packages and requirements needed in order for
 # pygeoprocessing to work as expected.
-Cython<3.0.0
 GDAL>=3.0.4
-numpy>=1.10.1
+numpy>=1.10.1,<2.0
 Rtree>=0.8.3
 scipy>=0.14.1,!=0.19.1
 Shapely>=1.6.4

diff --git a/setup.py b/setup.py
@@ -2,6 +2,7 @@
 import platform
 
 import numpy
+from Cython.Build import cythonize
 from setuptools import setup
 from setuptools.extension import Extension
 
@@ -27,8 +28,6 @@
     description="PyGeoprocessing: Geoprocessing routines for GIS",
     long_description=LONG_DESCRIPTION,
     long_description_content_type='text/x-rst',
-    maintainer='James Douglass',
-    maintainer_email='[email protected]',
     url='https://github.com/natcap/pygeoprocessing',
     packages=[
         'pygeoprocessing',
@@ -43,26 +42,7 @@
     install_requires=_REQUIREMENTS,
     license='BSD',
     zip_safe=False,
-    keywords='gis pygeoprocessing',
-    classifiers=[
-        'Intended Audience :: Developers',
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Science/Research',
-        'Natural Language :: English',
-        'Operating System :: MacOS :: MacOS X',
-        'Operating System :: Microsoft',
-        'Operating System :: POSIX',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-        'Programming Language :: Python :: Implementation :: CPython',
-        'Topic :: Scientific/Engineering :: GIS',
-        'License :: OSI Approved :: BSD License'
-    ],
-    ext_modules=[
+    ext_modules=cythonize([
         Extension(
             name="pygeoprocessing.routing.routing",
             sources=["src/pygeoprocessing/routing/routing.pyx"],
@@ -92,5 +72,5 @@
             extra_link_args=compiler_and_linker_args,
             language="c++"
         ),
-    ]
+    ])
 )
diff --git a/src/pygeoprocessing/geoprocessing_core.pyx b/src/pygeoprocessing/geoprocessing_core.pyx
@@ -1,6 +1,3 @@
-# coding=UTF-8
-# distutils: language=c++
-# cython: language_level=3
 import logging
 import multiprocessing
 import os

diff --git a/src/pygeoprocessing/routing/watershed.pyx b/src/pygeoprocessing/routing/watershed.pyx
@@ -1,5 +1,3 @@
-# coding=UTF-8
-# cython: language_level=3
 import logging
 import os
 import shutil