Repository: arrow
Updated Branches:
  refs/heads/master 72f80d450 -> c8eb49e41


ARROW-408: Remove defunct conda recipes

These are better maintained on conda-forge since there's also an associated 
cross-platform build environment

Author: Wes McKinney <wes.mckin...@twosigma.com>

Closes #231 from wesm/ARROW-408 and squashes the following commits:

8c58b75 [Wes McKinney] Remove defunct conda recipes


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

Branch: refs/heads/master
Commit: c8eb49e4136365f8056e09c36746b6dbb02d2814
Parents: 72f80d4
Author: Wes McKinney <wes.mckin...@twosigma.com>
Authored: Thu Dec 8 20:58:48 2016 +0100
Committer: Uwe L. Korn <uw...@xhochy.com>
Committed: Thu Dec 8 20:58:48 2016 +0100

----------------------------------------------------------------------
 cpp/conda.recipe/build.sh     | 62 --------------------------------------
 cpp/conda.recipe/meta.yaml    | 43 --------------------------
 python/conda.recipe/build.sh  | 45 ---------------------------
 python/conda.recipe/meta.yaml | 54 ---------------------------------
 4 files changed, 204 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/c8eb49e4/cpp/conda.recipe/build.sh
----------------------------------------------------------------------
diff --git a/cpp/conda.recipe/build.sh b/cpp/conda.recipe/build.sh
deleted file mode 100644
index 0536fd9..0000000
--- a/cpp/conda.recipe/build.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/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 -e
-set -x
-
-cd $RECIPE_DIR
-
-# Build dependencies
-export FLATBUFFERS_HOME=$PREFIX
-export PARQUET_HOME=$PREFIX
-
-if [ "$(uname)" == "Darwin" ]; then
-  # C++11 finagling for Mac OSX
-  export CC=clang
-  export CXX=clang++
-  export MACOSX_VERSION_MIN="10.7"
-  CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
-  CXXFLAGS="${CXXFLAGS} -stdlib=libc++ -std=c++11"
-  export LDFLAGS="${LDFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
-  export LDFLAGS="${LDFLAGS} -stdlib=libc++ -std=c++11"
-  export LINKFLAGS="${LDFLAGS}"
-  export MACOSX_DEPLOYMENT_TARGET=10.7
-fi
-
-cd ..
-
-rm -rf conda-build
-mkdir conda-build
-cd conda-build
-pwd
-
-# if [ `uname` == Linux ]; then
-#     SHARED_LINKER_FLAGS='-static-libstdc++'
-# elif [ `uname` == Darwin ]; then
-#     SHARED_LINKER_FLAGS=''
-# fi
-
-# -DCMAKE_SHARED_LINKER_FLAGS=$SHARED_LINKER_FLAGS \
-
-cmake \
-    -DCMAKE_BUILD_TYPE=release \
-    -DCMAKE_INSTALL_PREFIX=$PREFIX \
-    -DARROW_HDFS=on \
-    -DARROW_IPC=on \
-    -DARROW_PARQUET=on \
-    ..
-
-make
-ctest -L unittest
-make install

http://git-wip-us.apache.org/repos/asf/arrow/blob/c8eb49e4/cpp/conda.recipe/meta.yaml
----------------------------------------------------------------------
diff --git a/cpp/conda.recipe/meta.yaml b/cpp/conda.recipe/meta.yaml
deleted file mode 100644
index 31f150c..0000000
--- a/cpp/conda.recipe/meta.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-#  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.
-
-package:
-  name: arrow-cpp
-  version: "0.1"
-
-build:
-  number: {{environ.get('TRAVIS_BUILD_NUMBER', 0)}}    # [unix]
-  skip: true  # [win]
-  script_env:
-    - CC [linux]
-    - CXX [linux]
-    - LD_LIBRARY_PATH [linux]
-
-requirements:
-  build:
-    - cmake
-    - flatbuffers
-    - parquet-cpp
-
-  run:
-    - parquet-cpp
-
-test:
-  commands:
-    - test -f $PREFIX/lib/libarrow.so            # [linux]
-    - test -f $PREFIX/lib/libarrow_parquet.so    # [linux]
-    - test -f $PREFIX/include/arrow/api.h
-
-about:
-  home: http://github.com/apache/arrow
-  license: Apache 2.0
-  summary: 'C++ libraries for the reference Apache Arrow implementation'

http://git-wip-us.apache.org/repos/asf/arrow/blob/c8eb49e4/python/conda.recipe/build.sh
----------------------------------------------------------------------
diff --git a/python/conda.recipe/build.sh b/python/conda.recipe/build.sh
deleted file mode 100644
index fafe71e..0000000
--- a/python/conda.recipe/build.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/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
-
-# Build dependency
-export ARROW_HOME=$PREFIX
-
-cd $RECIPE_DIR
-
-if [ "$(uname)" == "Darwin" ]; then
-  # C++11 finagling for Mac OSX
-  export CC=clang
-  export CXX=clang++
-  export MACOSX_VERSION_MIN="10.7"
-  CXXFLAGS="${CXXFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
-  CXXFLAGS="${CXXFLAGS} -stdlib=libc++ -std=c++11"
-  export LDFLAGS="${LDFLAGS} -mmacosx-version-min=${MACOSX_VERSION_MIN}"
-  export LDFLAGS="${LDFLAGS} -stdlib=libc++ -std=c++11"
-  export LINKFLAGS="${LDFLAGS}"
-  export MACOSX_DEPLOYMENT_TARGET=10.7
-fi
-
-# echo Setting the compiler...
-# if [ `uname` == Linux ]; then
-#   EXTRA_CMAKE_ARGS=-DCMAKE_SHARED_LINKER_FLAGS=-static-libstdc++
-# elif [ `uname` == Darwin ]; then
-#   EXTRA_CMAKE_ARGS=
-# fi
-
-cd ..
-# $PYTHON setup.py build_ext --extra-cmake-args=$EXTRA_CMAKE_ARGS || exit 1
-$PYTHON setup.py build_ext || exit 1
-$PYTHON setup.py install || exit 1

http://git-wip-us.apache.org/repos/asf/arrow/blob/c8eb49e4/python/conda.recipe/meta.yaml
----------------------------------------------------------------------
diff --git a/python/conda.recipe/meta.yaml b/python/conda.recipe/meta.yaml
deleted file mode 100644
index b37dfde..0000000
--- a/python/conda.recipe/meta.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-#  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.
-
-package:
-  name: pyarrow
-  version: "0.1"
-
-build:
-  number: {{environ.get('TRAVIS_BUILD_NUMBER', 0)}}    # [unix]
-  rpaths:
-    - lib                                                        # [unix]
-    - lib/python{{environ.get('PY_VER')}}/site-packages/pyarrow  # [unix]
-  script_env:
-    - CC [linux]
-    - CXX [linux]
-    - LD_LIBRARY_PATH [linux]
-  skip: true  # [win]
-
-requirements:
-  build:
-    - cmake
-    - python
-    - setuptools
-    - cython
-    - numpy
-    - pandas
-    - arrow-cpp
-    - pytest
-
-  run:
-    - arrow-cpp
-    - parquet-cpp
-    - python
-    - numpy
-    - pandas
-    - six
-
-test:
-  imports:
-    - pyarrow
-
-about:
-  home: http://github.com/apache/arrow
-  license: Apache 2.0
-  summary: 'Python bindings for Arrow C++ and interoperability tool for pandas 
and NumPy'

Reply via email to