From ff6eb22faa9d188847a0ce367ac007d9f522ae99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= <szucs.krisztian@gmail.com>
Date: Tue, 24 Sep 2019 13:04:20 +0200
Subject: [PATCH 1/2] Include s3 support in the conda packages [skip ci]

---
 dev/tasks/conda-recipes/arrow-cpp/bld.bat   | 1 +
 dev/tasks/conda-recipes/arrow-cpp/build.sh  | 1 +
 dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 2 ++
 dev/tasks/conda-recipes/pyarrow/bld.bat     | 1 +
 dev/tasks/conda-recipes/pyarrow/build.sh    | 1 +
 dev/tasks/conda-recipes/pyarrow/meta.yaml   | 1 +
 6 files changed, 7 insertions(+)

diff --git a/dev/tasks/conda-recipes/arrow-cpp/bld.bat b/dev/tasks/conda-recipes/arrow-cpp/bld.bat
index 3702394416af..546d3f1c9a17 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/bld.bat
+++ b/dev/tasks/conda-recipes/arrow-cpp/bld.bat
@@ -18,6 +18,7 @@ cmake -G "Ninja" ^
       -DARROW_PARQUET:BOOL=ON ^
       -DARROW_GANDIVA:BOOL=ON ^
       -DARROW_ORC:BOOL=ON ^
+      -DARROW_S3:BOOL=ON ^
       -DBoost_NO_BOOST_CMAKE=ON ^
       ..
 
diff --git a/dev/tasks/conda-recipes/arrow-cpp/build.sh b/dev/tasks/conda-recipes/arrow-cpp/build.sh
index 03ca59aa994e..2a4d849cdeae 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/build.sh
+++ b/dev/tasks/conda-recipes/arrow-cpp/build.sh
@@ -34,6 +34,7 @@ cmake \
     -DARROW_PARQUET=ON \
     -DARROW_GANDIVA=ON \
     -DARROW_ORC=ON \
+    -DARROW_S3=ON \
     -DCMAKE_AR=${AR} \
     -DCMAKE_RANLIB=${RANLIB} \
     -GNinja \
diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
index 1e3faf1223cd..e8723b1908dd 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -20,6 +20,7 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
   host:
+    - aws-sdk-cpp
     - boost-cpp
     - brotli
     - c-ares
@@ -45,6 +46,7 @@ requirements:
 
   run:
     - {{ pin_compatible('numpy', lower_bound='1.14') }}
+    - aws-sdk-cpp
     - boost-cpp
     - brotli
     - c-ares
diff --git a/dev/tasks/conda-recipes/pyarrow/bld.bat b/dev/tasks/conda-recipes/pyarrow/bld.bat
index 023baa95c566..3e41f4bb77eb 100644
--- a/dev/tasks/conda-recipes/pyarrow/bld.bat
+++ b/dev/tasks/conda-recipes/pyarrow/bld.bat
@@ -15,6 +15,7 @@ copy /Y "%SRC_DIR%\cpp\cmake_modules\FindPythonLibsNew.cmake" cmake_modules\
 SET ARROW_HOME=%LIBRARY_PREFIX%
 SET SETUPTOOLS_SCM_PRETEND_VERSION=%PKG_VERSION%
 SET PYARROW_BUILD_TYPE=release
+SET PYARROW_WITH_S3=1
 SET PYARROW_WITH_FLIGHT=1
 SET PYARROW_WITH_GANDIVA=1
 SET PYARROW_WITH_PARQUET=1
diff --git a/dev/tasks/conda-recipes/pyarrow/build.sh b/dev/tasks/conda-recipes/pyarrow/build.sh
index 0c69c8cb8b54..fec01b727a1c 100644
--- a/dev/tasks/conda-recipes/pyarrow/build.sh
+++ b/dev/tasks/conda-recipes/pyarrow/build.sh
@@ -11,6 +11,7 @@ export PYARROW_BUILD_TYPE=release
 export PYARROW_WITH_FLIGHT=1
 export PYARROW_WITH_PLASMA=1
 export PYARROW_WITH_PARQUET=1
+export PYARROW_WITH_S3=1
 export PYARROW_WITH_ORC=1
 export PYARROW_WITH_GANDIVA=1
 
diff --git a/dev/tasks/conda-recipes/pyarrow/meta.yaml b/dev/tasks/conda-recipes/pyarrow/meta.yaml
index c970b1c4bfc9..6aba01a13b62 100644
--- a/dev/tasks/conda-recipes/pyarrow/meta.yaml
+++ b/dev/tasks/conda-recipes/pyarrow/meta.yaml
@@ -44,6 +44,7 @@ requirements:
 test:
   imports:
     - pyarrow
+    - pyarrow.fs
     - pyarrow.flight   # [not py==27]
     - pyarrow.gandiva  # [not py==27]
     - pyarrow.orc      # [unix]

From 7a3c67c81245c94254a0971814316a73c0a6e66a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= <szucs.krisztian@gmail.com>
Date: Wed, 25 Sep 2019 15:18:19 +0200
Subject: [PATCH 2/2] test s3fs import [skip ci]

---
 dev/tasks/conda-recipes/pyarrow/meta.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tasks/conda-recipes/pyarrow/meta.yaml b/dev/tasks/conda-recipes/pyarrow/meta.yaml
index 6aba01a13b62..2b84e15984ac 100644
--- a/dev/tasks/conda-recipes/pyarrow/meta.yaml
+++ b/dev/tasks/conda-recipes/pyarrow/meta.yaml
@@ -45,6 +45,7 @@ test:
   imports:
     - pyarrow
     - pyarrow.fs
+    - pyarrow.s3fs
     - pyarrow.flight   # [not py==27]
     - pyarrow.gandiva  # [not py==27]
     - pyarrow.orc      # [unix]