Merge pull request #168 from pysat/tst/rc_fix

Author: jklenzing

.github/workflows/main.yml

@@ -33,9 +33,7 @@ jobs:
 
     - name: Install NEP29 dependencies
       if: ${{ matrix.numpy_ver != 'latest'}}
-      run: |
-        pip install --no-binary :numpy: numpy==${{ matrix.numpy_ver }}
-        pip install pysatCDF --no-binary=pysatCDF
+      run: pip install numpy==${{ matrix.numpy_ver }}
 
     - name: Install standard dependencies
       run: |

.github/workflows/pip_rc_install.yml

@@ -27,4 +27,14 @@ jobs:
       run: pip install -r requirements.txt
 
     - name: Install pysatNASA RC
-      run: pip install --no-deps -i https://test.pypi.org/simple/ pysatNASA
+      run: pip install --no-deps --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysatNASA
+
+    - name: Set up pysat
+      run: |
+        mkdir pysatData
+        python -c "import pysat; pysat.params['data_dirs'] = 'pysatData'"
+
+    - name: Check that install imports correctly
+      run: |
+        cd ..
+        python -c "import pysatNASA; print(pysatNASA.__version__)"

.github/workflows/pysat_rc.yml

@@ -29,12 +29,11 @@ jobs:
       run: brew reinstall gcc
 
     - name: Install pysat RC
-      run: pip install --no-deps -i https://test.pypi.org/simple/ pysat
+      run: pip install --no-deps --pre -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysat
 
     - name: Install standard dependencies
       run: |
         pip install -r requirements.txt
-        pip install pysatCDF --no-binary=pysatCDF
         pip install -r test_requirements.txt
 
     - name: Set up pysat

.readthedocs.yml

@@ -0,0 +1,22 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+
+# Optionally declare the Python requirements required to build your docs
+python:
+   install:
+   - requirements: docs/requirements.txt

CHANGELOG.md

@@ -40,13 +40,15 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   * Deprecated jpl_gps instrtument module, moved roti instrument to igs_gps
 * Maintenance
   * Removed duplicate tests if pysatCDF not isntalled
-  * Only test pysatCDF on GitHub Actions for older numpy versions
+  * Removed pysatCDF tests on GitHub Actions workflows (see #167)
   * Updated actions and templates based on pysatEcosystem docs
   * Remove pandas cap on NEP29 tests
   * Updated dosctring style for consistency
   * Removed version cap for xarray
   * Added manual workflow to check that latest RC is installable through test pip
   * Update meta label type for instruments
+  * Updated GitHub Actions workflows for improved compliance with pip>=23.0
+  * Added .readthedocs.yml to configure settings there.
 
 ## [0.0.4] - 2022-11-07
 * Update instrument tests with new test class

pysatNASA/tests/test_instruments.py

@@ -87,7 +87,7 @@ def test_load_cdflib(self, inst_dict):
                     assert UserWarning in categories
                 else:
                     # If error message does not match, raise error anyway
-                    raise(verr)
+                    raise ValueError(verr)
 
             # Make sure fake data is cleared
             assert target not in test_inst.data