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
commit 740231d7c459207b232c1dcf6e4d27a3871cc835
Author: Krisztián Szűcs <szucs.kriszt...@gmail.com>
AuthorDate: Thu Oct 3 12:46:09 2019 -0500
ARROW-6771: [Packaging][Python] Missing pytest dependency from conda and
wheel builds
Closes #5569 from kszucs/ARROW-6771 and squashes the following commits:
43cceeae3 <Krisztián Szűcs> drop wheel-win-cp35m
f61a1eaf2 <Krisztián Szűcs> use conda-forge
1baeb43c2 <Krisztián Szűcs> use conda_env_python in windows wheels
ebd42dec9 <Krisztián Szűcs> properly skip is minio binary is missing
350aa4f9c <Krisztián Szűcs> conda test dependency
Authored-by: Krisztián Szűcs <szucs.kriszt...@gmail.com>
Signed-off-by: Wes McKinney <wesm+...@apache.org>
---
dev/tasks/conda-recipes/pyarrow/meta.yaml | 1 +
dev/tasks/python-wheels/win-build.bat | 6 ++++--
dev/tasks/tasks.yml | 11 -----------
python/pyarrow/tests/conftest.py | 2 +-
4 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/dev/tasks/conda-recipes/pyarrow/meta.yaml
b/dev/tasks/conda-recipes/pyarrow/meta.yaml
index c970b1c..51b6387 100644
--- a/dev/tasks/conda-recipes/pyarrow/meta.yaml
+++ b/dev/tasks/conda-recipes/pyarrow/meta.yaml
@@ -52,6 +52,7 @@ test:
requires:
- pytest
+ - pytest-lazy-fixture
- hypothesis
commands:
diff --git a/dev/tasks/python-wheels/win-build.bat
b/dev/tasks/python-wheels/win-build.bat
index dbb4e47..23410f6 100644
--- a/dev/tasks/python-wheels/win-build.bat
+++ b/dev/tasks/python-wheels/win-build.bat
@@ -79,8 +79,10 @@ set ARROW_TEST_DATA=%ARROW_SRC%\testing\data
@rem test the wheel
@rem TODO For maximum reliability, we should test in a plain virtualenv
instead.
-call conda create -n wheel-test -q -y python=%PYTHON_VERSION% ^
- numpy=%NUMPY_VERSION% pandas cython pytest hypothesis || exit /B
+call conda create -n wheel-test -c conda-forge -q -y ^
+ --file %ARROW_SRC%\ci\conda_env_python.yml ^
+ python=%PYTHON_VERSION% ^
+ numpy=%NUMPY_VERSION% || exit /B
call activate wheel-test
@rem install the built wheel
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 7a5d2af..ae9d699 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -46,7 +46,6 @@ groups:
- wheel-osx-cp35m
- wheel-osx-cp36m
- wheel-osx-cp37m
- - wheel-win-cp35m
- wheel-win-cp36m
- wheel-win-cp37m
@@ -146,7 +145,6 @@ groups:
- wheel-osx-cp35m
- wheel-osx-cp36m
- wheel-osx-cp37m
- - wheel-win-cp35m
- wheel-win-cp36m
- wheel-win-cp37m
- debian-stretch
@@ -469,15 +467,6 @@ tasks:
############################## Wheel Windows ################################
- wheel-win-cp35m:
- ci: appveyor
- platform: win
- template: python-wheels/appveyor.yml
- params:
- python_version: 3.5
- artifacts:
- - pyarrow-{no_rc_version}-cp35-cp35m-win_amd64.whl
-
wheel-win-cp36m:
ci: appveyor
platform: win
diff --git a/python/pyarrow/tests/conftest.py b/python/pyarrow/tests/conftest.py
index 1b98008..5f81547 100644
--- a/python/pyarrow/tests/conftest.py
+++ b/python/pyarrow/tests/conftest.py
@@ -259,7 +259,7 @@ def minio_server():
proc = None
try:
proc = subprocess.Popen(args, env=env)
- except IOError:
+ except (OSError, IOError):
pytest.skip('`minio` command cannot be located')
else:
yield address, access_key, secret_key
