From cc2c20cd1e65696b207407b176323c1768a97e59 Mon Sep 17 00:00:00 2001
From: Eric Engle <EricEngle-NOAA@users.noreply.github.com>
Date: Thu, 30 Nov 2023 15:25:52 -0500
Subject: [PATCH] Update tests and GitHub CI workflows.

---
 .github/workflows/build_linux.yml | 10 ++++------
 .github/workflows/build_macos.yml |  4 +---
 tests/test_grib2_read_unpack.py   |  7 +++++--
 tests/test_xarray_backend.py      |  6 +-----
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index f787e43..1cbbad6 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -33,9 +33,9 @@ jobs:
 
     - name: Install NCEPLIBS-g2c
       run: |
-        wget https://github.com/NOAA-EMC/NCEPLIBS-g2c/archive/refs/tags/v1.7.0.tar.gz
-        tar -xzvf v1.7.0.tar.gz
-        cd NCEPLIBS-g2c-1.7.0
+        wget https://github.com/NOAA-EMC/NCEPLIBS-g2c/archive/refs/tags/v1.8.0.tar.gz
+        tar -xzvf v1.8.0.tar.gz
+        cd NCEPLIBS-g2c-1.8.0
         mkdir build && cd build
         cmake -DUSE_Jasper=OFF -DUSE_OpenJPEG=ON -DBUILD_SHARED_LIBS=ON ..
         make -j2
@@ -45,6 +45,4 @@ jobs:
       run: |
         python --version
         pip install .
-        cd /tmp # Get out out source package
-        python -c "import grib2io; print(grib2io)"
-        python -c "import xarray; print(xarray.backends.list_engines().keys())"
+        pytest ./tests/
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index 64acc23..99efc6a 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -37,6 +37,4 @@ jobs:
       run: |
         python --version
         pip install .
-        cd /tmp # Get out of source package
-        python -c "import grib2io; print(grib2io)"
-        python -c "import xarray; print(xarray.backends.list_engines().keys())"
+        pytest ./tests/	
diff --git a/tests/test_grib2_read_unpack.py b/tests/test_grib2_read_unpack.py
index 6432a52..959aeb3 100755
--- a/tests/test_grib2_read_unpack.py
+++ b/tests/test_grib2_read_unpack.py
@@ -1,7 +1,10 @@
+import pytest
 import grib2io
 
-if __name__  == '__main__':
-    g = grib2io.open('./data/gfs.t00z.pgrb2.1p00.f024')
+def test_read_unpack_data(request):
+    grib2file = request.config.rootdir / 'tests' / 'data' / 'gfs.t00z.pgrb2.1p00.f024'
+    g = grib2io.open(grib2file)
     for msg in g:
+        msg.__str__()
         msg.data
     g.close()
diff --git a/tests/test_xarray_backend.py b/tests/test_xarray_backend.py
index 4e13151..da7520d 100755
--- a/tests/test_xarray_backend.py
+++ b/tests/test_xarray_backend.py
@@ -1,16 +1,12 @@
 import pytest
 import xarray as xr
-import grib2io
-import numpy as np
-import datetime
 
-def test_nemed_filter(request):
+def test_named_filter(request):
     data = request.config.rootdir / 'tests' / 'data'
     filters = dict(productDefinitionTemplateNumber=0, typeOfFirstFixedSurface=1)
     ds1 = xr.open_dataset(data / 'gfs.t00z.pgrb2.1p00.f024', engine='grib2io', filters=filters)
     filters = dict(productDefinitionTemplateNumber=0, typeOfFirstFixedSurface='Ground or Water Surface')
     ds2 = xr.open_dataset(data / 'gfs.t00z.pgrb2.1p00.f024', engine='grib2io', filters=filters)
-
     xr.testing.assert_equal(ds1, ds2)
 
 def test_multi_lead(request):