Merge pull request #149 from jklenzing/patch-1

BUG: Meson build on windows
aburrell · Jan 2, 2025 · 47d32d6 · 47d32d6
2 parents 24285ce + 6e0fc8b
commit 47d32d6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,37 +1,37 @@
 {
   "license": {
   "id": "MIT"
-  }, 
+  },
   "notes": "When referencing this package, please cite both the package DOI and the Apex Coordinates journal article: Emmert, J. T., A. D. Richmond, and D. P. Drob (2010), A computationally compact representation of Magnetic-Apex and Quasi-Dipole coordinates with smooth base vectors, J. Geophys. Res., 115(A8), A08322, doi:10.1029/2010JA015326.",
   "references": [
     "Emmert, J. T., A. D. Richmond, and D. P. Drob (2010), A computationally compact representation of Magnetic-Apex and Quasi-Dipole coordinates with smooth base vectors, J. Geophys. Res., 115(A8), A08322, doi:10.1029/2010JA015326.",
     "Richmond, A. D. (1995), Ionospheric Electrodynamics Using Magnetic Apex Coordinates, Journal of geomagnetism and geoelectricity, 47(2), 191–212, doi:10.5636/jgg.47.191."
-  ], 
+  ],
   "keywords": [
     "Magnetic Apex Coordinates",
     "Quasi Dipole Coordinates",
-    "MLT", 
-    "Magnetic Local Time", 
-    "Conversion", 
-    "Coordinate Conversion", 
-    "Converting", 
-    "Ionosphere", 
-    "Magnetic Field", 
-    "Space Physics", 
+    "MLT",
+    "Magnetic Local Time",
+    "Conversion",
+    "Coordinate Conversion",
+    "Converting",
+    "Ionosphere",
+    "Magnetic Field",
+    "Space Physics",
     "Heliophysics"
-  ], 
+  ],
   "creators": [
     {
-      "orcid": "0000-0002-8043-0953", 
+      "orcid": "0000-0002-8043-0953",
       "name": "van der Meeren, Christer"
     },
     {
       "orcid": "0000-0001-5028-4943",
       "name": "Laundal, Karl M."
     },
     {
-      "orcid": "0000-0001-8875-9326", 
-      "affiliation": "Naval Research Laboratory", 
+      "orcid": "0000-0001-8875-9326",
+      "affiliation": "Naval Research Laboratory",
       "name": "Burrell, Angeline G."
     },
     {
@@ -55,6 +55,11 @@
       "orcid": "0000-0001-9741-4063",
       "affiliation": "GFZ German Research Centre for Geosciences",
       "name": "Michaelis, Ingo"
+    },
+    {
+      "orcid": "0000-0001-8321-6074",
+      "affiliation": "Goddard Space Flight Center",
+      "name": "Klenzing, Jeff"
     }
   ]
 }
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -12,6 +12,7 @@ This python wrapper is made by:
 * Ashton Reimer
 * Achim Morschhauser
 * Ingo Michaelis
+* Jeff Klenzing
 
 Fortran code by Emmert et al. [2010] [1]_. Quasi-dipole and modified
 apex coordinates are defined by Richmond [1995] [2]_. The code uses

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Changelog
 * Fixed the command-line executable
 * Updated code to address deprecation warnings around np.float64 use
 * Updated code to remove use of datetime `utcnow`
+* Updated meson build requirements to include ninja for Windows builds instead of python-dev-tools
 
 2.0.2 (2024-11-12)
 ------------------

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,6 +5,7 @@ requires = [
 	 "meson-python>=0.12.0",
 	 "setuptools<60.0",  # Do not increase, 60.0 enables vendored distutils
 	 "Cython>=0.29.21",
+   "ninja",
 	 "numpy"
 ]