From 021e524b5c2e9c51ee9b2d909cee57df84b224d0 Mon Sep 17 00:00:00 2001
From: Roman Cattaneo <>
Date: Tue, 12 Nov 2024 15:30:50 +0100
Subject: [PATCH 1/3] Cleanup pass in setup.py

- Fully move from AI2 to NOAA-GDFL
- Restrict python version to 3.11
- Consistent license information
- Pin NDSL at latest release (2024.09.00)
---
 setup.py | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/setup.py b/setup.py
index 8a220b2..fa2592b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-"""The setup script."""
-
 from setuptools import find_namespace_packages, setup
 
 
@@ -15,35 +13,46 @@
     "xarray",
 ]
 
-test_requirements = ["pytest", "pytest-subtests", "serialbox", "coverage"]
-ndsl_requirements = ["ndsl @ git+https://github.com/NOAA-GFDL/NDSL.git@develop"]
-develop_requirements = test_requirements + ndsl_requirements + ["pre-commit"]
+test_requirements = [
+    "coverage",
+    "pytest",
+    "pytest-subtests",
+    "serialbox",
+]
+
+ndsl_requirements = ["ndsl @ git+https://github.com/NOAA-GFDL/NDSL.git@2024.09.00"]
+
+develop_requirements = [
+    *ndsl_requirements,
+    *test_requirements,
+    "pre-commit",
+]
 
 extras_requires = {
-    "test": test_requirements,
-    "ndsl": ndsl_requirements,
     "develop": develop_requirements,
+    "ndsl": ndsl_requirements,
+    "test": test_requirements,
 }
 
 setup(
-    author="The Allen Institute for Artificial Intelligence",
+    author="NOAA - Geophysical Fluid Dynamics Laboratory",
     author_email="oliver.elbert@noaa.gov",
-    python_requires=">=3.11",
+    python_requires=">=3.11,<3.12",
     classifiers=[
         "Development Status :: 2 - Pre-Alpha",
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: BSD License",
+        "License :: OSI Approved :: GPLv3 License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.11",
     ],
-    description="pyFV3 is a NDSL-based FV3 dynamical core for atmospheric models",
+    description="PyFV3 is a NDSL-based FV3 dynamical core for atmospheric models.",
     install_requires=requirements,
     extras_require=extras_requires,
-    license="BSD license",
+    license="GPLv3 license",
     long_description=readme,
     include_package_data=True,
-    name="pyFV3",
+    name="PyFV3",
     packages=find_namespace_packages(include=["pyFV3", "pyFV3.*"]),
     setup_requires=[],
     test_suite="tests",

From 1f8ed0b933fa9593307e69368e0ec0087263d274 Mon Sep 17 00:00:00 2001
From: Roman Cattaneo <>
Date: Wed, 13 Nov 2024 18:04:03 +0100
Subject: [PATCH 2/3] Revert name change

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index fa2592b..ba2c7e2 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@
     license="GPLv3 license",
     long_description=readme,
     include_package_data=True,
-    name="PyFV3",
+    name="pyFV3",
     packages=find_namespace_packages(include=["pyFV3", "pyFV3.*"]),
     setup_requires=[],
     test_suite="tests",

From 287cbd1074a21c751b7719784dd0210c1421813b Mon Sep 17 00:00:00 2001
From: Roman Cattaneo <>
Date: Thu, 14 Nov 2024 16:48:27 +0100
Subject: [PATCH 3/3] Remove unused config option `include_package_data`

This was added a while back (at AI2) when - for a brief amount of time -
the idea as to ship some translate test data with the package. This idea
was rejected and now the configuration option isn't needed anymore.
---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index ba2c7e2..9b0c318 100644
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,6 @@
     extras_require=extras_requires,
     license="GPLv3 license",
     long_description=readme,
-    include_package_data=True,
     name="pyFV3",
     packages=find_namespace_packages(include=["pyFV3", "pyFV3.*"]),
     setup_requires=[],