arrow git commit: ARROW-430: Improved version handling [Forced Update!]

2016-12-20 Thread wesm 
Repository: arrow
Updated Branches:
  refs/heads/master 8814d62b1 -> 73455b56f (forced update)


ARROW-430: Improved version handling

This reintroduces `setuptools_scm` versioning for git clones and sdists/wheels. 
git-archives are handled by a separate chunk of code that will infer the 
version from the `pom.xml`

As in the Maven world, always the next to-be-released version is specified and 
Python PEP 440 development versions are based on the previous release, it used 
the most minimal pre-release version specified there.

I would suggest to keep the conda package versioning as it is currently, i.e. 
manually set it to 0.1.0postX.

Also: I would rather not parse the Maven XML but that is the most simple way 
currently to ensure that the versioning system is in a state where we can still 
make releases with the Maven release plugin.

Author: Uwe L. Korn 

Closes #248 from xhochy/ARROW-430 and squashes the following commits:

39753f8 [Uwe L. Korn] Infer version from java/pom.xml
05c44ea [Uwe L. Korn] Get rid of setuptools_scm_git_archive
14b8136 [Uwe L. Korn] Revert "ARROW-429: Revert ARROW-379 until git-archive 
issues are resolved"

Change-Id: I4f6d291e63b2518af47c2a81049aa24a38c92821


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

Branch: refs/heads/master
Commit: 73455b56f705c3c11d3c29447082641dcab4c63a
Parents: f6bf112
Author: Uwe L. Korn 
Authored: Tue Dec 20 14:10:21 2016 -0500
Committer: Wes McKinney 
Committed: Tue Dec 20 16:19:26 2016 -0500

--
 cpp/cmake_modules/FindParquet.cmake| 109 
 dev/release/00-prepare.sh  |   5 --
 python/cmake_modules/FindParquet.cmake | 109 
 python/pyarrow/__init__.py |  10 ++-
 python/setup.cfg   |  20 +
 python/setup.py|  34 -
 6 files changed, 150 insertions(+), 137 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/arrow/blob/73455b56/cpp/cmake_modules/FindParquet.cmake
--
diff --git a/cpp/cmake_modules/FindParquet.cmake 
b/cpp/cmake_modules/FindParquet.cmake
deleted file mode 100644
index 7445e09..000
--- a/cpp/cmake_modules/FindParquet.cmake
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2012 Cloudera Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# - Find PARQUET (parquet/parquet.h, libparquet.a, libparquet.so)
-# This module defines
-#  PARQUET_INCLUDE_DIR, directory containing headers
-#  PARQUET_LIBS, directory containing parquet libraries
-#  PARQUET_STATIC_LIB, path to libparquet.a
-#  PARQUET_SHARED_LIB, path to libparquet's shared library
-#  PARQUET_FOUND, whether parquet has been found
-
-if( NOT "$ENV{PARQUET_HOME}" STREQUAL "")
-file( TO_CMAKE_PATH "$ENV{PARQUET_HOME}" _native_path )
-list( APPEND _parquet_roots ${_native_path} )
-elseif ( Parquet_HOME )
-list( APPEND _parquet_roots ${Parquet_HOME} )
-endif()
-
-# Try the parameterized roots, if they exist
-if ( _parquet_roots )
-  find_path( PARQUET_INCLUDE_DIR NAMES parquet/api/reader.h
-PATHS ${_parquet_roots} NO_DEFAULT_PATH
-PATH_SUFFIXES "include" )
-  find_library( PARQUET_LIBRARIES NAMES parquet
-PATHS ${_parquet_roots} NO_DEFAULT_PATH
-PATH_SUFFIXES "lib" )
-
-  find_library(PARQUET_ARROW_LIBRARIES NAMES parquet_arrow
-PATHS ${_parquet_roots} NO_DEFAULT_PATH
-PATH_SUFFIXES "lib")
-else ()
-find_path(PARQUET_INCLUDE_DIR NAMES parquet/api/reader.h )
-find_library(PARQUET_LIBRARIES NAMES parquet)
-find_library(PARQUET_ARROW_LIBRARIES NAMES parquet_arrow)
-endif ()
-
-
-if (PARQUET_INCLUDE_DIR AND PARQUET_LIBRARIES)
-  set(PARQUET_FOUND TRUE)
-  get_filename_component( PARQUET_LIBS ${PARQUET_LIBRARIES} PATH )
-  set(PARQUET_LIB_NAME libparquet)
-  set(PARQUET_STATIC_LIB ${PARQUET_LIBS}/${PARQUET_LIB_NAME}.a)
-  set(PARQUET_SHARED_LIB 
${PARQUET_LIBS}/${PARQUET_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
-else ()
-  set(PARQUET_FOUND FALSE)
-endif ()
-
-if (PARQUET_INCLUDE_DIR AND PARQUET_ARROW_LIBRARIES)
-

arrow git commit: ARROW-433: Correctly handle Arrow to Python date conversion for timezones west of London

2016-12-20 Thread wesm 
Repository: arrow
Updated Branches:
  refs/heads/master fe53fa409 -> 6ff5fcf1b


ARROW-433: Correctly handle Arrow to Python date conversion for timezones west 
of London

Verified with `TZ='America/New_York' py.test pyarrow`

Author: Uwe L. Korn 

Closes #245 from xhochy/ARROW-433 and squashes the following commits:

06745d8 [Uwe L. Korn] Use more pythonic approach
a55be24 [Uwe L. Korn] ARROW-433: Correctly handle Arrow to Python date 
conversion for timezones west of London


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

Branch: refs/heads/master
Commit: 6ff5fcf1bfb67d817d6261596d47cf6a6d9c3c6c
Parents: fe53fa4
Author: Uwe L. Korn 
Authored: Tue Dec 20 14:08:07 2016 -0500
Committer: Wes McKinney 
Committed: Tue Dec 20 14:08:07 2016 -0500

--
 python/pyarrow/scalar.pyx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/arrow/blob/6ff5fcf1/python/pyarrow/scalar.pyx
--
diff --git a/python/pyarrow/scalar.pyx b/python/pyarrow/scalar.pyx
index 09f60e2..623e3e4 100644
--- a/python/pyarrow/scalar.pyx
+++ b/python/pyarrow/scalar.pyx
@@ -127,7 +127,7 @@ cdef class DateValue(ArrayValue):
 
 def as_py(self):
 cdef CDateArray* ap =  self.sp_array.get()
-return datetime.date.fromtimestamp(ap.Value(self.index) / 1000)
+return datetime.datetime.utcfromtimestamp(ap.Value(self.index) / 
1000).date()
 
 
 cdef class TimestampValue(ArrayValue):