From b4e7631bffb0735474f42e67967d1a211f7b02c6 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Wed, 12 Jun 2024 16:31:42 -0700 Subject: [PATCH 1/6] Naming NatCap SW Team the maintainer, because we are. --- pyproject.toml | 6 ++++++ setup.py | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 576ba958..1c07759b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,9 @@ +[project] +maintainers = [ + {name = "Natural Capital Project Software Team"} +] + + [build-system] # these are the minimum packages needed in order to execute the pygeoprocessing build. # Setuptools, wheel are from pep508. diff --git a/setup.py b/setup.py index 78d517ab..6caf2b0c 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ """setup.py module for PyGeoprocessing.""" import platform -from Cython.Build import cythonize import numpy +from Cython.Build import cythonize from setuptools import setup from setuptools.extension import Extension @@ -28,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='jdouglass@stanford.edu', url='https://github.com/natcap/pygeoprocessing', packages=[ 'pygeoprocessing', From 7eb5b50975aa3b43a950e230e28485c02f9121a6 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Wed, 12 Jun 2024 16:39:48 -0700 Subject: [PATCH 2/6] Moving some extra info over to pyproject.toml. --- pyproject.toml | 22 ++++++++++++++++++++++ setup.py | 18 ------------------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1c07759b..636ed00a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,29 @@ [project] +name = "pygeoprocessing" +description = "PyGeoprocessing: Geoprocessing routines for GIS" +reuqires-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' +] [build-system] diff --git a/setup.py b/setup.py index 6caf2b0c..a83fc6bf 100644 --- a/setup.py +++ b/setup.py @@ -42,24 +42,6 @@ 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.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=cythonize([ Extension( name="pygeoprocessing.routing.routing", From 6c0c7237b2c899440812cfffa4394d2c5e88a2bd Mon Sep 17 00:00:00 2001 From: James Douglass Date: Wed, 12 Jun 2024 16:41:27 -0700 Subject: [PATCH 3/6] Forgot to remove a trailing comma. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 636ed00a..2eafe4e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ license = {file = "LICENSE.txt"} maintainers = [ {name = "Natural Capital Project Software Team"} ] -keywords = ['gis', 'geoprocessing', 'pygeoprocessing'], +keywords = ['gis', 'geoprocessing', 'pygeoprocessing'] classifiers = [ 'Intended Audience :: Developers', 'Development Status :: 5 - Production/Stable', From 8353b8057be166971a1632973cba36e7eeffe7be Mon Sep 17 00:00:00 2001 From: James Douglass Date: Wed, 12 Jun 2024 16:43:18 -0700 Subject: [PATCH 4/6] I misspelled requires. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2eafe4e8..b64e96d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "pygeoprocessing" description = "PyGeoprocessing: Geoprocessing routines for GIS" -reuqires-python = ">=3.6" +requires-python = ">=3.6" license = {file = "LICENSE.txt"} maintainers = [ {name = "Natural Capital Project Software Team"} From 272e4fd2fd6eb97f090c9eccbac7125a75537481 Mon Sep 17 00:00:00 2001 From: James Douglass Date: Wed, 12 Jun 2024 16:45:27 -0700 Subject: [PATCH 5/6] Naming a few dynamic attributes. --- pyproject.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index b64e96d9..7f74f89d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,10 @@ classifiers = [ '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` +dynamic = ["version", "dependencies", "optional-dependencies"] [build-system] From bf2d3a5b9bff85e10762a310cc47c9817a068bda Mon Sep 17 00:00:00 2001 From: James Douglass Date: Wed, 12 Jun 2024 16:51:29 -0700 Subject: [PATCH 6/6] Adding readme to dynamic attributes. --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7f74f89d..88df906e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,8 @@ classifiers = [ # 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` -dynamic = ["version", "dependencies", "optional-dependencies"] +# `readme` is provided by setuptools using the corresponding setup arg `long_description` +dynamic = ["version", "dependencies", "optional-dependencies", "readme"] [build-system]