You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2018/11/06 13:53:59 UTC
[arrow] branch master updated: ARROW-1994: [Python] Test against
Pandas master
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 8d1db71 ARROW-1994: [Python] Test against Pandas master
8d1db71 is described below
commit 8d1db719b2f09972c9e072a48b4ef81c8b14387e
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Tue Nov 6 14:53:29 2018 +0100
ARROW-1994: [Python] Test against Pandas master
Add to crossbow tests.yml as well after merging https://github.com/apache/arrow/pull/2755
Author: Krisztián Szűcs <sz...@gmail.com>
Closes #2758 from kszucs/ARROW-1994 and squashes the following commits:
669c5bca <Krisztián Szűcs> Add --no-cache to building instructions
34e2dd84 <Krisztián Szűcs> fix python version in python's Dockerfile
3e591ce1 <Krisztián Szűcs> test against pandas master
---
docker-compose.yml | 17 ++++++++++++++++-
{python => integration/pandas}/Dockerfile | 20 +++-----------------
python/Dockerfile | 2 +-
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 9ee2b44..c1f798d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -78,7 +78,7 @@ services:
python:
# Usage:
- # export PYTHON_VERSION=3.6
+ # export PYTHON_VERSION=2.7|3.6|3.7
# docker-compose build cpp
# docker-compose build python
# docker-compose run python
@@ -181,6 +181,21 @@ services:
context: .
dockerfile: integration/hdfs/Dockerfile
+ pandas-master:
+ # Usage:
+ # export PYTHON_VERSION=3.6
+ # docker-compose build cpp
+ # docker-compose build python
+ # docker-compose build --no-cache pandas-master
+ # docker-compose run pandas-master
+ image: arrow:pandas-master
+ build:
+ context: .
+ dockerfile: integration/pandas/Dockerfile
+ shm_size: 2G
+ volumes: *volumes
+
+
# TODO(kszucs): dask-integration
# TODO(kszucs): hive-integration
# TODO(kszucs): spark-integration
diff --git a/python/Dockerfile b/integration/pandas/Dockerfile
similarity index 64%
copy from python/Dockerfile
copy to integration/pandas/Dockerfile
index 41d0441..8b56edf 100644
--- a/python/Dockerfile
+++ b/integration/pandas/Dockerfile
@@ -15,21 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM arrow:cpp
+FROM arrow:python-3.6
-# install python specific packages
-ARG PYTHON_VERSION=3.6
-ADD ci/conda_env_python.yml /arrow/ci/
-RUN conda install -c conda-forge \
- --file arrow/ci/conda_env_python.yml && \
- python=$PYTHON_VERSION && \
- conda clean --all
-
-ENV CC=gcc \
- CXX=g++ \
- ARROW_PYTHON=ON
-
-# build and test
-CMD arrow/ci/docker_build_cpp.sh && \
- arrow/ci/docker_build_python.sh && \
- pytest -v --pyargs pyarrow
+# test against pandas' master
+RUN pip install git+https://github.com/pandas-dev/pandas.git
diff --git a/python/Dockerfile b/python/Dockerfile
index 41d0441..e97f82e 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -21,7 +21,7 @@ FROM arrow:cpp
ARG PYTHON_VERSION=3.6
ADD ci/conda_env_python.yml /arrow/ci/
RUN conda install -c conda-forge \
- --file arrow/ci/conda_env_python.yml && \
+ --file arrow/ci/conda_env_python.yml \
python=$PYTHON_VERSION && \
conda clean --all