Repository: climate
Updated Branches:
  refs/heads/master 4e36c1db7 -> 2411d7d70


CLIMATE-758 - Fix failing tests in test_local.py.


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

Branch: refs/heads/master
Commit: bd72c94cf8ed26e56ddbdb466fc3f2f261e41500
Parents: 4c4ff7c
Author: MichaelArthurAnderson <michael.arthur.ander...@gmail.com>
Authored: Sat Feb 27 15:35:20 2016 -0500
Committer: MichaelArthurAnderson <michael.arthur.ander...@gmail.com>
Committed: Sat Feb 27 15:35:20 2016 -0500

----------------------------------------------------------------------
 ocw/tests/test_local.py | 202 +++++++++++++++++++++----------------------
 1 file changed, 100 insertions(+), 102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/bd72c94c/ocw/tests/test_local.py
----------------------------------------------------------------------
diff --git a/ocw/tests/test_local.py b/ocw/tests/test_local.py
index a9e1a71..00a0654 100644
--- a/ocw/tests/test_local.py
+++ b/ocw/tests/test_local.py
@@ -15,22 +15,19 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import datetime
 import unittest
-import numpy
-import numpy.ma as ma
 import os
 import urllib
+import numpy
 import netCDF4
-import datetime
-import inspect
-import test_local # Import test_local so we can use inspect to get the path 
+
 import ocw.data_source.local as local
 
 
 class test_load_file(unittest.TestCase):
-
     def setUp(self):
-        #Read netCDF file
+        # Read netCDF file
         self.file_path = create_netcdf_object()
         self.netCDF_file = netCDF4.Dataset(self.file_path, 'r')
         self.latitudes = self.netCDF_file.variables['latitude'][:]
@@ -38,41 +35,37 @@ class test_load_file(unittest.TestCase):
         self.values = self.netCDF_file.variables['value'][:]
         self.variable_name_list = ['latitude', 'longitude', 'time', 'level', 
'value']
         self.possible_value_name = ['latitude', 'longitude', 'time', 'level']
-        
+
     def tearDown(self):
         os.remove(self.file_path)
-    
 
     def test_function_load_file_lats(self):
-        '''To test load_file function for latitudes'''
+        """To test load_file function for latitudes"""
         self.assertItemsEqual(local.load_file(self.file_path, "value").lats, 
self.latitudes)
 
-
     def test_function_load_file_lons(self):
-        '''To test load_file function for longitudes'''
+        """To test load_file function for longitudes"""
         self.assertItemsEqual(local.load_file(self.file_path, "value").lons, 
self.longitudes)
 
-
     def test_function_load_file_times(self):
-        '''To test load_file function for times'''
-        newTimes = datetime.datetime(2001,01,01), 
datetime.datetime(2001,02,01), datetime.datetime(2001,03,01)
+        """To test load_file function for times"""
+        newTimes = datetime.datetime(2001, 01, 01), datetime.datetime(2001, 
02, 01), datetime.datetime(2001, 03, 01)
         self.assertItemsEqual(local.load_file(self.file_path, "value").times, 
newTimes)
 
-
     def test_function_load_file_values(self):
-        '''To test load_file function for values'''
-        new_values = self.values[0,:,:,:]
+        """To test load_file function for values"""
+        new_values = self.values[:, 0, :, :]
         self.assertTrue(numpy.allclose(local.load_file(self.file_path, 
"value").values, new_values))
 
     def test_custom_dataset_name(self):
-        '''Test adding a custom name to a dataset'''
+        """Test adding a custom name to a dataset"""
         ds = local.load_file(self.file_path, 'value', name='foo')
         self.assertEqual(ds.name, 'foo')
 
     def test_dataset_origin(self):
         ds = local.load_file(self.file_path, 'value', elevation_index=1)
         expected_keys = set(['source', 'path', 'lat_name', 'lon_name',
-                             'time_name', 'elevation_index' ])
+                             'time_name', 'elevation_index'])
         self.assertEqual(set(ds.origin.keys()), expected_keys)
         self.assertEqual(ds.origin['source'], 'local')
 
@@ -92,107 +85,112 @@ class test_get_netcdf_variable_names(unittest.TestCase):
 
     def test_valid_latitude(self):
         self.lat = local._get_netcdf_variable_name(
-                                        local.LAT_NAMES, 
-                                        self.netcdf, 
-                                        "tasmax")
+            local.LAT_NAMES,
+            self.netcdf,
+            "tasmax")
         self.assertEquals(self.lat, "rlat")
 
     def test_invalid_dimension_latitude(self):
         self.netcdf = netCDF4.Dataset(self.invalid_netcdf_path, mode='r')
         self.lat = local._get_netcdf_variable_name(
-                                        local.LAT_NAMES,
-                                        self.netcdf,
-                                        "value")
+            local.LAT_NAMES,
+            self.netcdf,
+            "value")
         self.assertEquals(self.lat, "latitude")
 
     def test_dimension_variable_name_mismatch(self):
         self.netcdf = netCDF4.Dataset(self.invalid_netcdf_path, mode='r')
         self.lat = local._get_netcdf_variable_name(
-                                        ["lat_dim"] + local.LAT_NAMES,
-                                        self.netcdf,
-                                        "value")
+            ["lat_dim"] + local.LAT_NAMES,
+            self.netcdf,
+            "value")
         self.assertEquals(self.lat, "latitude")
 
     def test_no_match_latitude(self):
         with self.assertRaises(ValueError):
             self.lat = local._get_netcdf_variable_name(
-                                            ['notAVarName'],
-                                            self.netcdf, 
-                                            "tasmax")
+                ['notAVarName'],
+                self.netcdf,
+                "tasmax")
+
 
 def create_netcdf_object():
-        #To create the temporary netCDF file
-        file_path = '/tmp/temporaryNetcdf.nc'
-        netCDF_file = netCDF4.Dataset(file_path, 'w',  format='NETCDF4')
-        #To create dimensions
-        netCDF_file.createDimension('lat_dim', 5)
-        netCDF_file.createDimension('lon_dim', 5)
-        netCDF_file.createDimension('time_dim', 3)
-        netCDF_file.createDimension('level_dim', 2)
-        #To create variables
-        latitudes = netCDF_file.createVariable('latitude', 'd', ('lat_dim',))
-        longitudes = netCDF_file.createVariable('longitude', 'd', ('lon_dim',))
-        times = netCDF_file.createVariable('time', 'd', ('time_dim',))
-        levels = netCDF_file.createVariable('level', 'd', ('level_dim',))
-        values = netCDF_file.createVariable('value', 'd', ('level_dim', 
'time_dim', 'lat_dim', 'lon_dim'))
-        #To latitudes and longitudes for five values
-        latitudes = range(0,5)
-        longitudes = range(200,205)
-        #Three months of data
-        #Two levels
-        levels = [100, 200]
-        #Create 150 values
-        values = numpy.array([i for i in range(150)])
-        #Reshape values to 4D array (level, time, lats, lons)
-        values = values.reshape(len(levels), 
len(times),len(latitudes),len(longitudes))
-        #Ingest values to netCDF file
-        latitudes[:] = latitudes
-        longitudes[:] = longitudes
-        times[:] = numpy.array(range(3))
-        levels[:] = levels
-        values[:] = values
-        #Assign time info to time variable
-        netCDF_file.variables['time'].units = 'months since 2001-01-01 
00:00:00' 
-        netCDF_file.variables['value'].units = 'foo_units'
-        netCDF_file.close()
-        return file_path
+    # To create the temporary netCDF file
+    file_path = '/tmp/temporaryNetcdf.nc'
+    netCDF_file = netCDF4.Dataset(file_path, 'w', format='NETCDF4')
+    # To create dimensions
+    netCDF_file.createDimension('lat_dim', 5)
+    netCDF_file.createDimension('lon_dim', 5)
+    netCDF_file.createDimension('time_dim', 3)
+    netCDF_file.createDimension('level_dim', 2)
+    # To create variables
+    latitudes = netCDF_file.createVariable('latitude', 'd', ('lat_dim',))
+    longitudes = netCDF_file.createVariable('longitude', 'd', ('lon_dim',))
+    times = netCDF_file.createVariable('time', 'd', ('time_dim',))
+    levels = netCDF_file.createVariable('level', 'd', ('level_dim',))
+    values = netCDF_file.createVariable('value', 'd', ('time_dim', 
'level_dim', 'lat_dim', 'lon_dim'))
+
+    # To latitudes and longitudes for five values
+    latitudes_data = range(0, 5)
+    longitudes_data = range(150, 155)
+    # Three months of data.
+    times_data = numpy.array(range(3))
+    # Two levels
+    levels_data = [100, 200]
+    # Create 150 values
+    values_data = numpy.array([i for i in range(150)])
+    # Reshape values to 4D array (level, time, lats, lons)
+    values_data = values_data.reshape(len(times_data), len(levels_data), 
len(latitudes_data), len(longitudes_data))
+
+    # Ingest values to netCDF file
+    latitudes[:] = latitudes_data
+    longitudes[:] = longitudes_data
+    times[:] = times_data
+    levels[:] = levels_data
+    values[:] = values_data
+    # Assign time info to time variable
+    netCDF_file.variables['time'].units = 'months since 2001-01-01 00:00:00'
+    netCDF_file.variables['value'].units = 'foo_units'
+    netCDF_file.close()
+    return file_path
+
 
 def create_invalid_dimensions_netcdf_object():
-        #To create the temporary netCDF file
-        file_path = '/tmp/temporaryNetcdf.nc'
-        netCDF_file = netCDF4.Dataset(file_path, 'w', format='NETCDF4')
-        #To create dimensions
-        netCDF_file.createDimension('lat_dim', 5)
-        netCDF_file.createDimension('lon_dim', 5)
-        netCDF_file.createDimension('time_dim', 3)
-        netCDF_file.createDimension('level_dim', 2)
-        #To create variables
-        latitudes = netCDF_file.createVariable('latitude', 'd', ('lat_dim',))
-        longitudes = netCDF_file.createVariable('longitude', 'd', ('lon_dim',))
-        times = netCDF_file.createVariable('time', 'd', ('time_dim',))
-        levels = netCDF_file.createVariable('level', 'd', ('level_dim',))
-        values = netCDF_file.createVariable('value', 'd', ('level_dim', 
'time_dim', 'lat_dim', 'lon_dim'))
-        #To latitudes and longitudes for five values
-        latitudes = range(0,5)
-        longitudes = range(200,205)
-        #Three months of data
-        times = range(3)
-        #Two levels
-        levels = [100, 200]
-        #Create 150 values
-        values = numpy.array([i for i in range(150)])
-        #Reshape values to 4D array (level, time, lats, lons)
-        values = values.reshape(len(levels), 
len(times),len(latitudes),len(longitudes))
-        #Ingest values to netCDF file
-        latitudes[:] = latitudes
-        longitudes[:] = longitudes
-        times[:] = times
-        levels[:] = levels
-        values[:] = values
-        #Assign time info to time variable
-        netCDF_file.variables['time'].units = 'months since 2001-01-01 
00:00:00' 
-        netCDF_file.close()
-        return file_path
+    # To create the temporary netCDF file
+    file_path = '/tmp/temporaryNetcdf.nc'
+    netCDF_file = netCDF4.Dataset(file_path, 'w', format='NETCDF4')
+    # To create dimensions
+    netCDF_file.createDimension('lat_dim', 5)
+    netCDF_file.createDimension('lon_dim', 5)
+    netCDF_file.createDimension('time_dim', 3)
+    netCDF_file.createDimension('level_dim', 2)
+    # To create variables
+    latitudes = netCDF_file.createVariable('latitude', 'd', ('lat_dim',))
+    longitudes = netCDF_file.createVariable('longitude', 'd', ('lon_dim',))
+    times = netCDF_file.createVariable('time', 'd', ('time_dim',))
+    levels = netCDF_file.createVariable('level', 'd', ('level_dim',))
+    values = netCDF_file.createVariable('value', 'd', ('level_dim', 
'time_dim', 'lat_dim', 'lon_dim'))
+    # To latitudes and longitudes for five values
+    latitudes = range(0, 5)
+    longitudes = range(200, 205)
+    # Three months of data
+    times = range(3)
+    # Two levels
+    levels = [100, 200]
+    # Create 150 values
+    values = numpy.array([i for i in range(150)])
+    # Reshape values to 4D array (level, time, lats, lons)
+    values = values.reshape(len(levels), len(times), len(latitudes), 
len(longitudes))
+    # Ingest values to netCDF file
+    latitudes[:] = latitudes
+    longitudes[:] = longitudes
+    times[:] = times
+    levels[:] = levels
+    values[:] = values
+    # Assign time info to time variable
+    netCDF_file.variables['time'].units = 'months since 2001-01-01 00:00:00'
+    netCDF_file.close()
+    return file_path
 
 
 if __name__ == '__main__':

Reply via email to