arrow git commit: ARROW-327: [Python] Remove conda builds from Travis CI setup

[wesm]

Repository: arrow
Updated Branches:
  refs/heads/master 676c32cce -> e2c0a1831


ARROW-327: [Python] Remove conda builds from Travis CI setup

We'll do these builds in conda-forge

Author: Wes McKinney 

Closes #178 from wesm/ARROW-327 and squashes the following commits:

1303d6e [Wes McKinney] Remove conda builds


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

Branch: refs/heads/master
Commit: e2c0a18316504a0177129cb66b25a9dc54291587
Parents: 676c32c
Author: Wes McKinney 
Authored: Mon Oct 17 22:46:44 2016 -0400
Committer: Wes McKinney 
Committed: Mon Oct 17 22:46:44 2016 -0400

--
 .travis.yml  | 18 -
 ci/travis_conda_build.sh | 45 ---
 2 files changed, 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/arrow/blob/e2c0a183/.travis.yml
--
diff --git a/.travis.yml b/.travis.yml
index 97229b1..a53756c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,24 +41,6 @@ matrix:
 script:
 - $TRAVIS_BUILD_DIR/ci/travis_script_cpp.sh
 - $TRAVIS_BUILD_DIR/ci/travis_script_python.sh
-  - compiler: gcc
-env: ARROW_TEST_GROUP=packaging
-os: linux
-before_script:
-- export CC="gcc-4.9"
-- export CXX="g++-4.9"
-script:
-- $TRAVIS_BUILD_DIR/ci/travis_conda_build.sh
-  - os: osx
-env: ARROW_TEST_GROUP=packaging
-language: objective-c
-osx_image: xcode6.4
-compiler: clang
-addons:
-before_script:
-before_install:
-script:
-- $TRAVIS_BUILD_DIR/ci/travis_conda_build.sh
   - language: java
 os: linux
 jdk: oraclejdk7

http://git-wip-us.apache.org/repos/asf/arrow/blob/e2c0a183/ci/travis_conda_build.sh
--
diff --git a/ci/travis_conda_build.sh b/ci/travis_conda_build.sh
deleted file mode 100755
index 17a33ae..000
--- a/ci/travis_conda_build.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-#  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. See accompanying LICENSE file.
-
-set -ex
-
-source $TRAVIS_BUILD_DIR/ci/travis_install_conda.sh
-
-# Build libarrow
-
-cd $TRAVIS_BUILD_DIR/cpp
-
-conda build conda.recipe --channel apache/channel/dev
-CONDA_PACKAGE=`conda build --output conda.recipe | grep bz2`
-
-if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
-  anaconda --token $ANACONDA_TOKEN upload $CONDA_PACKAGE --user apache 
--channel dev;
-fi
-
-# Build pyarrow
-
-cd $TRAVIS_BUILD_DIR/python
-
-build_for_python_version() {
-  PY_VERSION=$1
-  conda build conda.recipe --python $PY_VERSION --channel apache/channel/dev
-  CONDA_PACKAGE=`conda build --python $PY_VERSION --output conda.recipe | grep 
bz2`
-
-  if [ $TRAVIS_BRANCH == "master" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; 
then
-   anaconda --token $ANACONDA_TOKEN upload $CONDA_PACKAGE --user apache 
--channel dev;
-  fi
-}
-
-build_for_python_version 2.7
-build_for_python_version 3.5

[1/2] arrow git commit: ARROW-261: Refactor String/Binary code paths to reflect unnested (non-list-based) structure

[wesm]

Repository: arrow
Updated Branches:
  refs/heads/master 8e8b17f99 -> 732a2059d


http://git-wip-us.apache.org/repos/asf/arrow/blob/732a2059/python/src/pyarrow/adapters/pandas.h
--
diff --git a/python/src/pyarrow/adapters/pandas.h 
b/python/src/pyarrow/adapters/pandas.h
index 141d121..532495d 100644
--- a/python/src/pyarrow/adapters/pandas.h
+++ b/python/src/pyarrow/adapters/pandas.h
@@ -32,27 +32,26 @@ namespace arrow {
 class Array;
 class Column;
 class MemoryPool;
+class Status;
 
 } // namespace arrow
 
 namespace pyarrow {
 
-class Status;
-
 PYARROW_EXPORT
-Status ConvertArrayToPandas(const std::shared_ptr& arr, 
PyObject* py_ref,
-PyObject** out);
+arrow::Status ConvertArrayToPandas(const std::shared_ptr& arr,
+PyObject* py_ref, PyObject** out);
 
 PYARROW_EXPORT
-Status ConvertColumnToPandas(const std::shared_ptr& col, 
PyObject* py_ref,
-PyObject** out);
+arrow::Status ConvertColumnToPandas(const std::shared_ptr& col,
+PyObject* py_ref, PyObject** out);
 
 PYARROW_EXPORT
-Status PandasMaskedToArrow(arrow::MemoryPool* pool, PyObject* ao, PyObject* mo,
+arrow::Status PandasMaskedToArrow(arrow::MemoryPool* pool, PyObject* ao, 
PyObject* mo,
 std::shared_ptr* out);
 
 PYARROW_EXPORT
-Status PandasToArrow(arrow::MemoryPool* pool, PyObject* ao,
+arrow::Status PandasToArrow(arrow::MemoryPool* pool, PyObject* ao,
 std::shared_ptr* out);
 
 } // namespace pyarrow

http://git-wip-us.apache.org/repos/asf/arrow/blob/732a2059/python/src/pyarrow/api.h
--
diff --git a/python/src/pyarrow/api.h b/python/src/pyarrow/api.h
index 72be6af..6dbbc45 100644
--- a/python/src/pyarrow/api.h
+++ b/python/src/pyarrow/api.h
@@ -18,8 +18,6 @@
 #ifndef PYARROW_API_H
 #define PYARROW_API_H
 
-#include "pyarrow/status.h"
-
 #include "pyarrow/helpers.h"
 
 #include "pyarrow/adapters/builtin.h"

http://git-wip-us.apache.org/repos/asf/arrow/blob/732a2059/python/src/pyarrow/common.cc
--
diff --git a/python/src/pyarrow/common.cc b/python/src/pyarrow/common.cc
index 09f3efb..fa875f2 100644
--- a/python/src/pyarrow/common.cc
+++ b/python/src/pyarrow/common.cc
@@ -21,10 +21,10 @@
 #include 
 #include 
 
-#include 
-#include 
+#include "arrow/util/memory-pool.h"
+#include "arrow/util/status.h"
 
-#include "pyarrow/status.h"
+using arrow::Status;
 
 namespace pyarrow {
 
@@ -33,18 +33,18 @@ class PyArrowMemoryPool : public arrow::MemoryPool {
   PyArrowMemoryPool() : bytes_allocated_(0) {}
   virtual ~PyArrowMemoryPool() {}
 
-  arrow::Status Allocate(int64_t size, uint8_t** out) override {
+  Status Allocate(int64_t size, uint8_t** out) override {
 std::lock_guard guard(pool_lock_);
 *out = static_cast(std::malloc(size));
 if (*out == nullptr) {
   std::stringstream ss;
   ss << "malloc of size " << size << " failed";
-  return arrow::Status::OutOfMemory(ss.str());
+  return Status::OutOfMemory(ss.str());
 }
 
 bytes_allocated_ += size;
 
-return arrow::Status::OK();
+return Status::OK();
   }
 
   int64_t bytes_allocated() const override {

http://git-wip-us.apache.org/repos/asf/arrow/blob/732a2059/python/src/pyarrow/common.h
--
diff --git a/python/src/pyarrow/common.h b/python/src/pyarrow/common.h
index 50c2577..7f3131e 100644
--- a/python/src/pyarrow/common.h
+++ b/python/src/pyarrow/common.h
@@ -29,13 +29,6 @@ namespace pyarrow {
 
 #define PYARROW_IS_PY2 PY_MAJOR_VERSION <= 2
 
-#define RETURN_ARROW_NOT_OK(s) do { \
-arrow::Status _s = (s); \
-if (!_s.ok()) { \
-  return Status::ArrowError(s.ToString());  \
-}   \
-  } while (0);
-
 class OwnedRef {
  public:
   OwnedRef() : obj_(nullptr) {}

http://git-wip-us.apache.org/repos/asf/arrow/blob/732a2059/python/src/pyarrow/io.cc
--
diff --git a/python/src/pyarrow/io.cc b/python/src/pyarrow/io.cc
index 7bf32ff..e6dbc12 100644
--- a/python/src/pyarrow/io.cc
+++ b/python/src/pyarrow/io.cc
@@ -20,12 +20,13 @@
 #include 
 #include 
 
-#include 
-#include 
-#include 
+#include "arrow/io/memory.h"
+#include "arrow/util/memory-pool.h"
+#include "arrow/util/status.h"
 
 #include "pyarrow/common.h"
-#include "pyarrow/status.h"
+
+using arrow::Status;
 
 namespace pyarrow {
 
@@ -41,7 +42,7 @@ PythonFile::~PythonFile() {
   Py_DECREF(file_);
 }
 
-static arrow::Status CheckPyError() {
+static Status CheckPyError() {
   if (PyErr_Occurred()) {
 PyObject *exc_type, *exc_value, *traceback;
 PyErr_Fetch(_type, _value, );
@@ -51,35 +52,35 @@ static arrow::Status CheckPyError() {
 Py_XDECREF(exc_value);
 Py_XDECREF(traceback);
 PyErr_Clear();
-return