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 D1CF6200B66 for ; Thu, 4 Aug 2016 00:51:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CED96160AAA; Wed, 3 Aug 2016 22:51:51 +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 2B9E6160A8C for ; Thu, 4 Aug 2016 00:51:51 +0200 (CEST) Received: (qmail 94290 invoked by uid 500); 3 Aug 2016 22:51:50 -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 94274 invoked by uid 99); 3 Aug 2016 22:51:50 -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; Wed, 03 Aug 2016 22:51:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F3C6EEC22C; Wed, 3 Aug 2016 22:51:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: huikyole@apache.org To: commits@climate.apache.org Date: Wed, 03 Aug 2016 22:51:50 -0000 Message-Id: <98fc6f5619974c03af572159ce38b359@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] climate git commit: CLIMATE-842 - Add shape files to package installation - Added the ocw/shape directory to the package build. - Set zip_safe to False in the setup script. This means and builds via conda or pip will maintain the original directory archived-at: Wed, 03 Aug 2016 22:51:52 -0000 CLIMATE-842 - Add shape files to package installation - Added the ocw/shape directory to the package build. - Set zip_safe to False in the setup script. This means and builds via conda or pip will maintain the original directory structure of the ocw directory instead of bundling everything into a binary .egg file. This will make imports a tad slower, but it is necessary in order to ensure that the shapefiles can be found. It also allows users to more easily check the source code on their machines. - Renamed usa_states shapefiles to "us_states", so that boundary_type always has the same name as the shapefile. Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/91ec7f31 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/91ec7f31 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/91ec7f31 Branch: refs/heads/master Commit: 91ec7f31c0c1cd6ac77372de7409f070f5d1e723 Parents: d73c3c2 27c1c94 Author: huikyole Authored: Wed Aug 3 15:51:01 2016 -0700 Committer: huikyole Committed: Wed Aug 3 15:51:01 2016 -0700 ---------------------------------------------------------------------- MANIFEST.in | 1 + ocw/dataset.py | 56 +++++++++++++++++++++--------------------- ocw/shape/us_states.dbf | Bin 0 -> 12962 bytes ocw/shape/us_states.shp | Bin 0 -> 222344 bytes ocw/shape/us_states.shx | Bin 0 -> 508 bytes ocw/shape/usa_states.dbf | Bin 12962 -> 0 bytes ocw/shape/usa_states.shp | Bin 222344 -> 0 bytes ocw/shape/usa_states.shx | Bin 508 -> 0 bytes setup.py | 14 ++++++++--- 9 files changed, 40 insertions(+), 31 deletions(-) ----------------------------------------------------------------------