From 754f7ff077a1bb5738e427d2394be4ec5a3cb2eb Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Sat, 28 Apr 2018 23:24:10 +0200 Subject: [PATCH] Skip failing tests on Appveyor for Python 2.7 --- appveyor.yml | 4 ---- neurtu/tests/test_blas.py | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 51fc85f..8f98bda 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,10 +7,6 @@ environment: PYTHON_ARCH: "64" MINICONDA: C:\Miniconda-x64 REQUIREMENTS: "pytest numpy" - - PYTHON_VERSION: "3.5.x" - PYTHON_ARCH: "32" - MINICONDA: C:\Miniconda35 - REQUIREMENTS: "pytest numpy pandas" - PYTHON_VERSION: "3.6.x" PYTHON_ARCH: "64" MINICONDA: C:\Miniconda36-x64 diff --git a/neurtu/tests/test_blas.py b/neurtu/tests/test_blas.py index 609d2de..e4bd643 100644 --- a/neurtu/tests/test_blas.py +++ b/neurtu/tests/test_blas.py @@ -4,6 +4,7 @@ from __future__ import division import os +import sys from glob import glob import subprocess @@ -57,10 +58,14 @@ def test_detect_blas(): @pytest.mark.skipif(np is None, reason='numpy not installed') @pytest.mark.parametrize('blas_name', ['mkl', 'openblas', 'blas']) def test_blas_set_threads(blas_name): + name, dll_path = detect_blas() if name != blas_name: pytest.skip('blas=%s not found!' % blas_name) + if 'CI' in os.environ and sys.version_info < (3, 4) and name == 'mkl': + pytest.skip('Appveyor with Python 2.7 fails to load the MKL DLL') + blas = Blas(dll_path) num_threads_0 = blas.get_num_threads()