Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 20473200AF7 for ; Tue, 14 Jun 2016 08:43:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1F046160A62; Tue, 14 Jun 2016 06:43:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 95A06160A56 for ; Tue, 14 Jun 2016 08:43:29 +0200 (CEST) Received: (qmail 96785 invoked by uid 500); 14 Jun 2016 06:43:28 -0000 Mailing-List: contact commits-help@climate.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@climate.apache.org Delivered-To: mailing list commits@climate.apache.org Received: (qmail 96699 invoked by uid 99); 14 Jun 2016 06:43:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jun 2016 06:43:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50BBBE95C0; Tue, 14 Jun 2016 06:43:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jarifibrahim@apache.org To: commits@climate.apache.org Date: Tue, 14 Jun 2016 06:43:31 -0000 Message-Id: <3eb49b598f194f90976ac8ba693e8395@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] climate git commit: Resolve merge conflict archived-at: Tue, 14 Jun 2016 06:43:30 -0000 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 Authored: Tue Jun 14 12:12:31 2016 +0530 Committer: Ibrahim 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*