climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [2/2] climate git commit: CLIMATE-885 Upgrade to Podaacpy 1.9.0
Date Thu, 20 Apr 2017 18:12:30 GMT
CLIMATE-885 Upgrade to Podaacpy 1.9.0


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c656b3b4
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c656b3b4
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c656b3b4

Branch: refs/heads/master
Commit: c656b3b46f718ef5a2b90cf9ba9ea7f45fcd78d3
Parents: 44402fb
Author: Lewis John McGibbney <lewis.mcgibbney@gmail.com>
Authored: Thu Apr 20 11:06:17 2017 -0700
Committer: Lewis John McGibbney <lewis.mcgibbney@gmail.com>
Committed: Thu Apr 20 11:06:17 2017 -0700

----------------------------------------------------------------------
 ocw/tests/test_podaac.py | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/c656b3b4/ocw/tests/test_podaac.py
----------------------------------------------------------------------
diff --git a/ocw/tests/test_podaac.py b/ocw/tests/test_podaac.py
index d253192..09b6901 100644
--- a/ocw/tests/test_podaac.py
+++ b/ocw/tests/test_podaac.py
@@ -33,15 +33,19 @@ class TestPodaacDataSource(unittest.TestCase):
         cls.file_path = os.path.dirname(os.path.abspath(__file__))
         cls.format = '.nc'
         cls.dataset = podaac.extract_l4_granule(cls.variable, cls.datasetId, cls.name)
-        cls.json = 'subset.json'
-        cls.subset_datasetId = 'PODAAC-GHRAM-4FA01'
-        cls.subset_variable = 'analysed_sst'
-        cls.subset_name = 'GHRSST Level 4 RAMSSA Australian Regional Foundation Sea Surface
Temperature Analysis'
-        cls.granule_subset = podaac.subset_granule(
-            cls.subset_variable,
-            cls.subset_datasetId,
-            name=cls.subset_name,
-            input_file_path=cls.json)
+        # Currently the PO.DAAC subsetting is only available for Level2 granules,
+        # plans are underway to extend this to Level3 and 4 granules and OCW can make use
+        # of this when that functionality becomes available. More information about Level2
+        # subsetting can be found at https://podaac.jpl.nasa.gov/ws/subset/granule/index.html
+        #cls.json = 'subset.json'
+        #cls.subset_datasetId = 'PODAAC-GHRAM-4FA01'
+        #cls.subset_variable = 'analysed_sst'
+        #cls.subset_name = 'GHRSST Level 4 RAMSSA Australian Regional Foundation Sea Surface
Temperature Analysis'
+        #cls.granule_subset = podaac.subset_granule(
+        #    cls.subset_variable,
+        #    cls.subset_datasetId,
+        #    name=cls.subset_name,
+        #    input_file_path=cls.json)
 
     def test_is_dataset(self):
         print('in test_is_dataset')
@@ -71,15 +75,15 @@ class TestPodaacDataSource(unittest.TestCase):
     def test_dataset_origin(self):
         print('in test_dataset_origin')
         self.assertEquals(self.dataset.origin['source'], 'PO.DAAC')
-        self.assertEquals(self.dataset.origin['url'], 'podaac.jpl.nasa.gov/ws')
+        self.assertEquals(self.dataset.origin['url'], 'podaac.jpl.nasa.gov')
 
     def test_custom_name(self):
         print('in test_custom_name')
         self.assertEquals(self.dataset.name, self.name)
 
-    def test_granule_subset(self):
-        print('in test_granule_subset')
-        self.assertEquals(self.granule_subset.name, self.subset_name)
+    #def test_granule_subset(self):
+    #    print('in test_granule_subset')
+    #    self.assertEquals(self.granule_subset.name, self.subset_name)
 
 if __name__ == '__main__':
     unittest.main()


Mime
View raw message