From a8c8bc30c76bc2abb2723e5e5ff6a56abeb5d841 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Ilia=C5=A1?= Date: Fri, 18 Mar 2016 20:01:34 +0100 Subject: [PATCH 1/4] update the %path% variable so that it can find git.exe command (is hidden in the default %path% variable ) --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6b8f9a6..9f19e3b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ version: 1.0.{build} # prepare environment environment: # set custom path (will be more extended later in build_script section) - path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Git\cmd;C:\Program Files\7-Zip;C:\Program Files (x86)\CMake\bin + path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Git\cmd;C:\Program Files\7-Zip;C:\Program Files (x86)\CMake\bin;%path% # set MinGw-w64 (64-bit) version 5.1.0 download URL url: http://kent.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.1.0/threads-posix/seh/x86_64-5.1.0-release-posix-seh-rt_v4-rev0.7z matrix: From cdf8d4ef40b47d26de4fe079242fba28bd0954a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Ilia=C5=A1?= Date: Fri, 18 Mar 2016 21:03:31 +0100 Subject: [PATCH 2/4] fix openblas package download because the old link for downloading expired, I provided new link for downloading --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 9f19e3b..f0729ec 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,7 +32,7 @@ build_script: - set path=%path%;C:\software\mingw64\bin # download and unpack the OpenBLAS library, integer*4 (or i32lp64) version -- ps: wget http://skylink.dl.sourceforge.net/project/openblas/v0.2.14/OpenBLAS-v0.2.14-Win64-int32.zip -OutFile OpenBLAS-v0.2.14-Win64-int32.zip +- ps: wget http://web-docs.gsi.de/~milias/openblas-package/OpenBLAS-v0.2.14-Win64-int32.zip -OutFile OpenBLAS-v0.2.14-Win64-int32.zip - 7z x OpenBLAS-v0.2.14-Win64-int32.zip > NUL # add both OpenBLAS dynamic (libopenblas.dll) and static (libopenblas.a) library files dir to path - set path=%path%;C:\software\OpenBLAS-v0.2.14-Win64-int32\bin;C:\software\OpenBLAS-v0.2.14-Win64-int32\lib;C:\software\OpenBLAS-v0.2.14-Win64-int32\include From 7380b9c284cd95c79649619c3199788d145a56b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Ilia=C5=A1?= Date: Fri, 18 Mar 2016 21:25:48 +0100 Subject: [PATCH 3/4] update path variable so that there will be no conflicts between cmake and git --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f0729ec..2d276e6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,8 @@ version: 1.0.{build} # prepare environment environment: # set custom path (will be more extended later in build_script section) - path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Git\cmd;C:\Program Files\7-Zip;C:\Program Files (x86)\CMake\bin;%path% -# set MinGw-w64 (64-bit) version 5.1.0 download URL + path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Git\cmd;C:\Program Files\7-Zip;C:\Program Files (x86)\CMake\bin + # set MinGw-w64 (64-bit) version 5.1.0 download URL url: http://kent.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.1.0/threads-posix/seh/x86_64-5.1.0-release-posix-seh-rt_v4-rev0.7z matrix: # - python: C:\Python27;C:\Python27\Scripts From 0c3f91ba8e90b4c8564b1cec33260ca63dc833ac Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Tue, 29 Mar 2016 07:02:05 +0200 Subject: [PATCH 4/4] disable appveyor support; fixes #112, fixes #167 --- appveyor.yml | 57 ---------------------------------------------------- test/test.py | 9 --------- 2 files changed, 66 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 2d276e6..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,57 +0,0 @@ -# OS: 64-bit Windows Server 2012 R2 -# Compilers: 64-bit MinGw-w64 5.1.0 (downloaded during script execution) -# Python: 2.7, 64-bit -# "ps:" commands are executed in PowerShell - -# build version format: 1.0.1, 1.0.2, ... -version: 1.0.{build} - -# prepare environment -environment: -# set custom path (will be more extended later in build_script section) - path: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Git\cmd;C:\Program Files\7-Zip;C:\Program Files (x86)\CMake\bin - # set MinGw-w64 (64-bit) version 5.1.0 download URL - url: http://kent.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.1.0/threads-posix/seh/x86_64-5.1.0-release-posix-seh-rt_v4-rev0.7z - matrix: -# - python: C:\Python27;C:\Python27\Scripts - - python: C:\Python27-x64;C:\Python27-x64\Scripts -# - python: C:\Python34;C:\Python34\Scripts -# - python: C:\Python34-x64;C:\Python34-x64\Scripts - -build_script: -# add location of used Python to path -- set path=%path%;%python% - -# create dir for custom software and move there -- mkdir C:\software && cd C:\software - -# download and unpack MinGw-w64 compilers -- ps: wget $env:url -OutFile MinGW.7z -- 7z x MinGW.7z > NUL -# add compilers binary dir to path -- set path=%path%;C:\software\mingw64\bin - -# download and unpack the OpenBLAS library, integer*4 (or i32lp64) version -- ps: wget http://web-docs.gsi.de/~milias/openblas-package/OpenBLAS-v0.2.14-Win64-int32.zip -OutFile OpenBLAS-v0.2.14-Win64-int32.zip -- 7z x OpenBLAS-v0.2.14-Win64-int32.zip > NUL -# add both OpenBLAS dynamic (libopenblas.dll) and static (libopenblas.a) library files dir to path -- set path=%path%;C:\software\OpenBLAS-v0.2.14-Win64-int32\bin;C:\software\OpenBLAS-v0.2.14-Win64-int32\lib;C:\software\OpenBLAS-v0.2.14-Win64-int32\include - -# download and upgrade pip -- ps: wget https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py -- python get-pip.py - -# install py.test -- pip install pytest - -# go back to project source dir -- cd %APPVEYOR_BUILD_FOLDER% - -test_script: -# show environment -- echo %path% -- py.test --version -# run tests -- py.test -vv update.py -- py.test -vv test/test.py -- py.test -vv lib/config.py diff --git a/test/test.py b/test/test.py index 69fa309..77e0981 100644 --- a/test/test.py +++ b/test/test.py @@ -10,7 +10,6 @@ import pytest HERE = os.path.abspath(os.path.dirname(__file__)) -skip_on_windows = pytest.mark.skipif('sys.platform == "win32"', reason="not working on windows") skip_on_osx = pytest.mark.skipif('sys.platform == "darwin"', reason="not working on osx") skip_on_linux = pytest.mark.skipif('sys.platform == "linux2"', reason="not working on linux") skip_always = pytest.mark.skipif('1 == 1', reason="tests are broken") @@ -119,24 +118,20 @@ def test_fc_omp(): configure_build_and_exe('fc_omp', 'python setup --omp --fc=gfortran') -@skip_on_windows def test_fc_blas(): configure_build_and_exe('fc_blas', 'python setup --fc=gfortran --blas') -@skip_on_windows def test_fc_lapack(): configure_build_and_exe('fc_lapack', 'python setup --fc=gfortran --lapack') @skip_on_osx -@skip_on_windows def test_cxx_cblas(): configure_build_and_exe('cxx_cblas', 'python setup --cxx=g++ --cblas') @skip_on_linux -@skip_on_windows def test_cxx_accelerate(): configure_build_and_exe('cxx_accelerate', 'python setup --cxx=g++ --accelerate') @@ -150,23 +145,19 @@ def test_python_interpreter_custom(): configure_build_and_exe('python_interpreter_custom', setup) -@skip_on_windows def test_python_libs(): configure_build_and_exe('python_libs', 'python setup --cxx=g++') -@skip_on_windows def test_python_libs_custom(): python_executable = sys.executable configure_build_and_exe('python_libs_custom', 'python setup --cxx=g++ --python={}'.format(python_executable)) -@skip_on_windows def test_boost_header_only(): configure_build_and_exe('boost_header_only', 'python setup --cxx=g++') @skip_on_osx -@skip_on_windows def test_boost_libs(): configure_build_and_exe('boost_libs', 'python setup --cxx=g++ --mpi')