Merge pull request #15 from SWxTREC/new-release

Preparing for a new release v0.2.0

Author: greglucas

.github/workflows/tests.yml

@@ -0,0 +1,35 @@
+name: tests
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install enlilviz
+      run: |
+        python -m pip install --upgrade pip
+        pip install -v .[test]
+
+    - name: Run tests
+      run: |
+        pytest --color=yes

.travis.yml

@@ -2,6 +2,11 @@
 History
 =======
 
+0.2.0 (2022-11-27)
+------------------
+
+* Fix handling of missing data variables from more recent suball files that NOAA uses.
+
 0.0.1 (2020-02-17)
 ------------------
 

HISTORY.rst

@@ -47,7 +47,7 @@
 napoleon_google_docstring = False
 
 intersphinx_mapping = {
-    'numpy': ('https://docs.scipy.org/doc/numpy/', None),
+    'numpy': ('https://numpy.org/doc/stable/', None),
     'xarray': ('https://xarray.pydata.org/en/stable/', None)
 }
 

docs/conf.py

@@ -2,7 +2,7 @@
 
 __author__ = """Greg Lucas"""
 __email__ = 'greg.lucas@lasp.colorado.edu'
-__version__ = '0.1.0'
+__version__ = '0.2.0'
 
 from .io import read_enlil2d, read_evo
 __all__ = ['read_enlil2d', 'read_evo']

enlilviz/__init__.py

@@ -213,13 +213,13 @@ def read_enlil2d(filename):
                 da = xr.concat([_unstack_fieldline(ds[sat + '_FLD_' + var])
                                 for sat in _satellites],
                                dim='satellite')
-                ds = ds.drop([sat + '_FLD_' + var for sat in _satellites])
+                ds = ds.drop_vars([sat + '_FLD_' + var for sat in _satellites])
                 name += 'fld_'
             else:
                 try:
                     da = xr.concat([ds[sat + '_' + var] for sat in _satellites],
                                 dim='satellite')
-                    ds = ds.drop([sat + '_' + var for sat in _satellites])
+                    ds = ds.drop_vars([sat + '_' + var for sat in _satellites])
                 except KeyError:
                     # If the variable isn't here, continue the loop
                     continue
@@ -257,7 +257,7 @@ def read_evo(filename):
         t0 = np.datetime64(ds.attrs['refdate_cal'], 's')
     time = t0 + np.array(ds['TIME'], np.timedelta64)
     ds = ds.rename({'nevo': 'earth_t'}).assign_coords({'earth_t': time})
-    ds = ds.drop(['TIME', 'DT', 'NSTEP'])
+    ds = ds.drop_vars(['TIME', 'DT', 'NSTEP'])
 
     for var in _variables_evo:
         if var not in ds:
@@ -271,7 +271,7 @@ def read_evo(filename):
         # Unit conversions
         da = _transform_variable(da)
         ds[name] = da
-        ds = ds.drop(var)
+        ds = ds.drop_vars(var)
         ds.attrs['name'] = ds.label
 
     return Evolution(ds)
@@ -359,7 +359,7 @@ def _calibrate_variable(ds, var):
     # Update the name of the data array
     da.name = name
     ds[name] = da
-    ds = ds.drop(var)
+    ds = ds.drop_vars(var)
     return ds
 
 
@@ -380,8 +380,8 @@ def _transform_dimensions(ds):
                            't': t,
                            'earth_t': earth_t,
                            'satellite': _satellites,
-                           }).drop(['x_coord', 'y_coord', 'z_coord',
-                                    'time', 'Earth_TIME'])
+                           }).drop_vars(['x_coord', 'y_coord', 'z_coord',
+                                         'time', 'Earth_TIME'])
 
     ds['x'] = ds['x'] / _unit_conversion['AU']
     ds['x'].attrs = {'long_name': 'radial cell positions',

enlilviz/io.py

@@ -0,0 +1,45 @@
+[build-system]
+requires = [
+    "setuptools >= 48.0.0",
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "enlilviz"
+version = "0.2.0"
+description = "A Python package for visualizing output from the Enlil code."
+authors = [
+    {name = "Greg Lucas", email="greg.lucas@lasp.colorado.edu"},
+]
+license = {file = "LICENSE"}
+readme = "README.rst"
+requires-python = ">=3.8"
+
+keywords = ["Enlil", "Visualization"]
+
+classifiers = [
+    'Development Status :: 2 - Pre-Alpha',
+    'Intended Audience :: Developers',
+    'License :: OSI Approved :: MIT License',
+    'Natural Language :: English',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+
+]
+
+dependencies = [
+    "numpy", "matplotlib", "xarray", "netcdf4"
+]
+
+[project.optional-dependencies]
+test = [
+    "pytest>=3",
+]
+
+[project.urls]
+homepage = "https://github.com/SWxTREC/enlilviz"
+documentation = "https://enlilviz.readthedocs.io"
+repository = "https://github.com/SWxTREC/enlilviz"