diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index fac402e..520aad8 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -8,10 +8,10 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: '0' - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: '3.8' - shell: bash diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6e70cd3..5c6f7df 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,10 +11,10 @@ jobs: python-version: [3.8] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -33,7 +33,7 @@ jobs: make ci - name: Archive code coverage results - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: code-coverage-report path: htmlcov/* diff --git a/tests/test_dmrpp.py b/tests/test_dmrpp.py index bb945ca..7d54504 100644 --- a/tests/test_dmrpp.py +++ b/tests/test_dmrpp.py @@ -1,24 +1,24 @@ import json import os import unittest +from xml.etree import ElementTree import requests -import xml.etree.ElementTree as ElementTree import eosdis_store.dmrpp as dmr testpath = os.path.dirname(__file__) +s3_folder = 'https://harmony.uat.earthdata.nasa.gov/service-results/harmony-uat-eedtest-data/zarr-store' class Test(unittest.TestCase): test_files = [ - 'https://harmony.uat.earthdata.nasa.gov/service-results/harmony-uat-staging/public/demo/zarr-store/f16_ssmis_20051022v7.nc.dmrpp', - 'https://harmony.uat.earthdata.nasa.gov/service-results/harmony-uat-staging/public/demo/zarr-store/3B-HHR.MS.MRG.3IMERG.20051022-S000000-E002959.0000.V06B.HDF5.dmrpp', + f'{s3_folder}/f16_ssmis_20051022v7.nc.dmrpp', + f'{s3_folder}/3B-HHR.MS.MRG.3IMERG.20051022-S000000-E002959.0000.V06B.HDF5.dmrpp', # MODIS data 'https://archive.podaac.uat.earthdata.nasa.gov/podaac-uat-cumulus-protected/MODIS_A-JPL-L2P-v2019.0/20200911000001-JPL-L2P_GHRSST-SSTskin-MODIS_A-N-v02.0-fv01.0.nc.dmrpp', - # 'https://harmony.uat.earthdata.nasa.gov/service-results/harmony-uat-staging/public/demo/zarr-store/3B-HHR.MS.MRG.3IMERG.20051022-S233000-E235959.1410.V06B.HDF5.dmrpp', ] @classmethod diff --git a/tests/test_stores.py b/tests/test_stores.py index a36026a..8b533a8 100644 --- a/tests/test_stores.py +++ b/tests/test_stores.py @@ -1,10 +1,10 @@ import json import os import unittest +from xml.etree import ElementTree import numpy as np import requests -import xml.etree.ElementTree as ElementTree import xarray import zarr @@ -12,13 +12,15 @@ testpath = os.path.dirname(__file__) +s3_folder = 'https://harmony.uat.earthdata.nasa.gov/service-results/harmony-uat-eedtest-data/zarr-store' + fixtures = [ { - "url": 'https://harmony.uat.earthdata.nasa.gov/service-results/harmony-uat-staging/public/demo/zarr-store/f16_ssmis_20051022v7.nc', + "url": f"{s3_folder}/f16_ssmis_20051022v7.nc", "aoi": (0, slice(400, 549, None), slice(1040, 1261, None)) }, { - "url": "https://harmony.uat.earthdata.nasa.gov/service-results/harmony-uat-staging/public/demo/zarr-store/3B-HHR.MS.MRG.3IMERG.20051022-S000000-E002959.0000.V06B.HDF5", + "url": f"{s3_folder}/3B-HHR.MS.MRG.3IMERG.20051022-S000000-E002959.0000.V06B.HDF5", "aoi": (0, slice(800, 1351, None), slice(1000, 1371, None)) }, { @@ -61,7 +63,7 @@ def test_eosdis_store_open(self): assert(arrays[0][0] == 'atmosphere_cloud_liquid_water_content') arr = arrays[0][1] assert(type(arr) == zarr.core.Array) - assert(arr.name == '/atmosphere_cloud_liquid_water_content') + assert(arr.name == '/atmosphere_cloud_liquid_water_content') assert(arr.shape == (2, 720, 1440)) def test_eosdis_store_read(self): @@ -137,7 +139,7 @@ def test_scale_offset(self): assert(not hasattr(wv, "scale_factor")) assert(not hasattr(wv, "add_offset")) arr = wv[fixtures[0]["aoi"]] - + self.assertAlmostEqual(arr.mean().item(), mean * scale_factor + add_offset, places=5) def test_fillvalue(self): @@ -166,5 +168,3 @@ def test_fillvalue(self): mean2 = np.nanmean(arr2) self.assertAlmostEqual(mean, mean2, places=4) - - \ No newline at end of file