Merge branch 'maint/nep29_apr24' into ssusi_bug

pysat · Jun 14, 2024 · 0d4ca86 · 0d4ca86
2 parents c05d594 + 58af874
commit 0d4ca86
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 27 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,12 +11,12 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.11", "3.12"]
         numpy_ver: ["latest"]
         test_config: ["latest"]
         include:
-          - python-version: "3.9"
-            numpy_ver: "1.21"
+          - python-version: "3.10"
+            numpy_ver: "1.23"
             os: ubuntu-latest
             test_config: "NEP29"
           - python-version: "3.6.8"
@@ -40,10 +40,17 @@ jobs:
     - name: Install Operational dependencies
       if: ${{ matrix.test_config == 'Ops'}}
       run: |
+        sudo apt-get install libhdf5-serial-dev netcdf-bin libnetcdf-dev
         pip install --no-cache-dir numpy==${{ matrix.numpy_ver }}
         pip install "cdflib<1.0"
         pip install -r requirements.txt
         pip install -r test_requirements.txt
+        cd ..
+        git clone https://github.com/pysat/pysat.git
+        cd pysat
+        git checkout pip_rc_install
+        python setup.py develop
+        cd ../pysatNASA
         pip install .
 
     - name: Install NEP29 dependencies

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,12 +1,25 @@
 {
+  "keywords": [
+    "pysat",
+    "ionosphere",
+    "atmosphere",
+    "thermosphere",
+    "magnetosphere",
+    "heliosphere",
+    "observations",
+    "models",
+    "space",
+    "satellites",
+    "analysis"
+    ],
     "creators": [
       {
         "affiliation": "Goddard Space Flight Center",
         "name": "Klenzing, Jeff",
         "orcid": "0000-0001-8321-6074"
       },
       {
-        "affiliation": "The University of Texas at Dallas",
+        "affiliation": "Cosmic Studio",
         "name": "Stoneback, Russell",
         "orcid": "0000-0001-7216-4336"
       },
@@ -25,18 +38,18 @@
         "name": "Navarro, Luis",
         "orcid": "0000-0002-6362-6575"
       },
+      {
+        "affiliation": "NASA Postdoctoral Program, Goddard Space Flight Center",
+        "name": "Esman, Teresa",
+        "orcid": "0000-0003-0382-6281"
+      },
       {
         "affiliation": "Predictive Science",
         "name": "Pembroke, Asher"
       },
       {
         "name": "Spence, Carey",
         "orcid": "0000-0001-8340-5625"
-      },
-      {
-        "affiliation": "NASA Postdoctoral Program, Goddard Space Flight Center",
-        "name": "Esman, Teresa",
-        "orcid": "0000-0003-0382-6281"
       }
     ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 * Documentation
   * Added example of how to export data for archival
   * Updated documentation refs
+  * Add keywords to zenodo
 * Deprecations
   * Deprecated '' tag for de2_vefi module, support moved to de2_vefimagb
 * Maintenance
@@ -36,6 +37,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   * Use standard clean routine for C/NOFS VEFI mag data
   * Added version cap for sphinx_rtd_theme
   * Include standard tests for ICON IVM-B
+  * Update NEP29 standards for Apr 2024
 
 ## [0.0.5] - 2023-06-27
 * New Instruments

diff --git a/pyproject.toml b/pyproject.toml
@@ -22,9 +22,9 @@ classifiers = [
   "Natural Language :: English",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.6",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Operating System :: POSIX :: Linux",
   "Operating System :: MacOS :: MacOS X",
   "Operating System :: Microsoft :: Windows"

diff --git a/pysatNASA/instruments/dmsp_ssusi.py b/pysatNASA/instruments/dmsp_ssusi.py
@@ -84,22 +84,18 @@
 
 _test_dates = {inst_id: {tag: dt.datetime(2015, 1, 1) for tag in tags.keys()}
                for inst_id in inst_ids.keys()}
-_clean_warn = {inst_id: {tag: mm_nasa.clean_warnings
-                         for tag in inst_ids[inst_id]
-                         if tag not in ['sdr-disk', 'sdr2-disk']}
-               for inst_id in inst_ids.keys()}
-# TODO(#218): Remove when compliant with multi-day load tests
-_new_tests = {inst_id: {'sdr-disk': False, 'sdr2-dist': False}
+# TODO(#218, #222): Remove when compliant with multi-day load tests
+_new_tests = {inst_id: {tag: False for tag in tags.keys()}
               for inst_id in inst_ids.keys()}
-_clean_warn = {inst_id: {tag: mm_nasa.clean_warnings
-                         for tag in inst_ids[inst_id]
-                         if tag not in ['sdr-disk', 'sdr2-disk']}
-               for inst_id in inst_ids.keys()}
+# TODO(pysat#1196): Un-comment when pysat bug is fixed and released
+# _clean_warn = {inst_id: {tag: mm_nasa.clean_warnings
+#                          for tag in inst_ids[inst_id]
+#                          if tag not in ['sdr-disk', 'sdr2-disk']}
+#                for inst_id in inst_ids.keys()}
 
 # ----------------------------------------------------------------------------
 # Instrument methods
 
-
 # Use standard init routine
 init = functools.partial(mm_nasa.init, module=mm_dmsp, name=name)
 

diff --git a/pysatNASA/instruments/icon_fuv.py b/pysatNASA/instruments/icon_fuv.py
@@ -67,9 +67,9 @@
 
 _test_dates = {'': {kk: dt.datetime(2020, 1, 1) for kk in tags.keys()}}
 _test_load_opt = {'': {kk: {'keep_original_names': True} for kk in tags.keys()}}
-_clean_warn = {inst_id: {tag: mm_icon.fuv_clean_warnings
-                         for tag in inst_ids[inst_id]}
-               for inst_id in inst_ids.keys()}
+# TODO(#218, #222): Remove when compliant with multi-day load tests
+_new_tests = {inst_id: {tag: False for tag in tags.keys()}
+              for inst_id in inst_ids.keys()}
 
 # ----------------------------------------------------------------------------
 # Instrument methods

diff --git a/pysatNASA/instruments/timed_guvi.py b/pysatNASA/instruments/timed_guvi.py
@@ -96,9 +96,10 @@
                   for iid in ['high_res', 'low_res']}
 # TODO(#218): Remove when compliant with multi-day load tests
 _new_tests = {'high_res': {tag: False for tag in inst_ids['high_res']}}
-_clean_warn = {inst_id: {tag: mm_nasa.clean_warnings
-                         for tag in inst_ids[inst_id] if tag != 'sdr-imaging'}
-               for inst_id in inst_ids.keys()}
+# TODO(pysat#1196): Un-comment when pysat bug is fixed and released
+# _clean_warn = {inst_id: {tag: mm_nasa.clean_warnings
+#                          for tag in inst_ids[inst_id] if tag != 'sdr-imaging'}
+#                for inst_id in inst_ids.keys()}
 
 # ----------------------------------------------------------------------------
 # Instrument methods