climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jarifibra...@apache.org
Subject [4/4] climate git commit: Resolve merge conflict
Date Tue, 14 Jun 2016 06:43:31 GMT
Resolve merge conflict


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

Branch: refs/heads/master
Commit: 03e9d9f05c50f8b82ced017f9939117180fe15a7
Parents: 5498681 23551e2
Author: Ibrahim <jarifibrahim@gmail.com>
Authored: Tue Jun 14 12:12:31 2016 +0530
Committer: Ibrahim <jarifibrahim@gmail.com>
Committed: Tue Jun 14 12:12:31 2016 +0530

----------------------------------------------------------------------
 .coveragerc                     |   4 +
 ocw/tests/lat_lon_time_daily.nc | Bin 0 -> 6242 bytes
 ocw/tests/test_utils.py         | 161 ++++++++++++++++++++++++++++++++++-
 3 files changed, 162 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/03e9d9f0/.coveragerc
----------------------------------------------------------------------
diff --cc .coveragerc
index fa45ba4,2bab358..accf369
--- a/.coveragerc
+++ b/.coveragerc
@@@ -18,8 -18,5 +18,12 @@@
  [report]
  exclude_lines = 
      if __name__ == .__main__.:
++    
 +    # These lines will never be executed under any circumstances
 +    if level_index == 0:
 +    elif level_index == 1:
 +    elif level_index == 2:
 +    else:
++    
+     # Due to issue https://issues.apache.org/jira/browse/CLIMATE-803
+     def calc_subregion_area_mean_and_std*


Mime
View raw message