Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ARROW-55: [Python] Fix unit tests in 2.7 #25

Closed
wants to merge 2 commits into from
Closed

ARROW-55: [Python] Fix unit tests in 2.7 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b00524b
ARROW-55: [Python] Fix unit tests in 2.7
danrobinson Mar 16, 2016
dda4396
ARROW-55: Add Python 2.7 tests to travis-ci
danrobinson Mar 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions ci/travis_script_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,34 @@ export PATH="$MINICONDA/bin:$PATH"
conda update -y -q conda
conda info -a

PYTHON_VERSION=3.5
CONDA_ENV_NAME=pyarrow-test
python_version_tests() {
PYTHON_VERSION=$1
CONDA_ENV_NAME="pyarrow-test-${PYTHON_VERSION}"
conda create -y -q -n $CONDA_ENV_NAME python=$PYTHON_VERSION
source activate $CONDA_ENV_NAME

conda create -y -q -n $CONDA_ENV_NAME python=$PYTHON_VERSION
source activate $CONDA_ENV_NAME
python --version
which python

python --version
which python
# faster builds, please
conda install -y nomkl

# faster builds, please
conda install -y nomkl
# Expensive dependencies install from Continuum package repo
conda install -y pip numpy pandas cython

# Expensive dependencies install from Continuum package repo
conda install -y pip numpy pandas cython
# Other stuff pip install
pip install -r requirements.txt

# Other stuff pip install
pip install -r requirements.txt
export ARROW_HOME=$ARROW_CPP_INSTALL

export ARROW_HOME=$ARROW_CPP_INSTALL
python setup.py build_ext --inplace

python setup.py build_ext --inplace
py.test -vv -r sxX pyarrow
}

py.test -vv -r sxX pyarrow
# run tests for python 2.7 and 3.5
python_version_tests 2.7
python_version_tests 3.5

# if [ $TRAVIS_OS_NAME == "linux" ]; then
# valgrind --tool=memcheck py.test -vv -r sxX arrow
Expand Down
2 changes: 1 addition & 1 deletion python/src/pyarrow/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace arrow { class MemoryPool; }

namespace pyarrow {

#define PYARROW_IS_PY2 PY_MAJOR_VERSION < 2
#define PYARROW_IS_PY2 PY_MAJOR_VERSION <= 2

#define RETURN_ARROW_NOT_OK(s) do { \
arrow::Status _s = (s); \
Expand Down