Merge pull request #167 from isuruf/tests

Update testing

Author: isuruf

appveyor.yml

@@ -13,10 +13,22 @@ environment:
       COMPILER: MSVC15
       PLATFORM: "Win32"
       PYTHON_VERSION: 27
+      CONDA_INSTALL_LOCN: C:\\Miniconda35
+      WITH_MPFR: yes
+      WITH_MPC: yes
     - BUILD_TYPE: "Release"
       COMPILER: MSVC15
       PLATFORM: "x64"
       PYTHON_VERSION: 35-x64
+      CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
+      WITH_MPFR: yes
+      WITH_MPC: yes
+      WITH_LLVM: yes
+    - BUILD_TYPE: "Release"
+      COMPILER: MSVC15
+      PLATFORM: "x64"
+      PYTHON_VERSION: 36-x64
+      CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
 #    - BUILD_TYPE: "Debug"
 #      COMPILER: MinGW
 #      PYTHON_VERSION: 27
@@ -35,13 +47,15 @@ install:
 - set PYTHON_SOURCE_DIR=%CD%
 - git clone https://github.com/sympy/symengine symengine-cpp
 
-- if [%COMPILER%]==[MSVC15] set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-- if [%COMPILER%]==[MSVC15] call symengine-cpp\bin\appveyor-download.cmd https://raw.githubusercontent.com/symengine/dependencies/fd912ad34c848e7a7a9dab4628f836ab167b9e59/mpir-2.7.0.zip
-- if [%COMPILER%]==[MSVC15] 7z x mpir-2.7.0.zip > NUL
-- if [%COMPILER%]==[MSVC15] msbuild mpir-2.7.0/build.vc14/lib_mpir_gc/lib_mpir_gc.vcxproj /p:Configuration=%BUILD_TYPE% /p:Platform=%PLATFORM% /p:PlatformToolset=%PLATFORMTOOLSET% /verbosity:minimal
-- if [%COMPILER%]==[MSVC15] msbuild mpir-2.7.0/build.vc14/lib_mpir_cxx/lib_mpir_cxx.vcxproj /p:Configuration=%BUILD_TYPE% /p:Platform=%PLATFORM% /p:PlatformToolset=%PLATFORMTOOLSET% /verbosity:minimal
-- if [%COMPILER%]==[MSVC15] copy mpir-2.7.0\build.vc14\lib_mpir_gc\%PLATFORM%\%BUILD_TYPE%\mpir.lib mpir-2.7.0\lib\%PLATFORM%\%BUILD_TYPE%\gmp.lib
-- if [%COMPILER%]==[MSVC15] copy mpir-2.7.0\build.vc14\lib_mpir_cxx\%PLATFORM%\%BUILD_TYPE%\mpirxx.lib mpir-2.7.0\lib\%PLATFORM%\%BUILD_TYPE%\gmpxx.lib
+- if [%COMPILER%]==[MSVC15] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
+- if [%COMPILER%]==[MSVC15] conda update --yes --quiet conda
+- if [%COMPILER%]==[MSVC15] conda config --add channels conda-forge
+- if [%COMPILER%]==[MSVC15] if [%BUILD_TYPE%]==[Debug] conda config --add channels symengine/label/debug
+- if [%COMPILER%]==[MSVC15] conda create -n test --yes mpir=3.0.0 vc=14
+- if [%COMPILER%]==[MSVC15] call activate test
+- if [%COMPILER%]==[MSVC15] if [%WITH_MPFR%]==[yes] conda install --yes mpfr=3.1.5
+- if [%COMPILER%]==[MSVC15] if [%WITH_MPC%]==[yes] conda install --yes mpc=1.0.3
+- if [%COMPILER%]==[MSVC15] if [%WITH_LLVM%]==[yes] conda install --yes llvmdev=3.9
 
 - if [%COMPILER%]==[MinGW] set PATH=C:\MinGW\bin;%PATH%
 - if [%COMPILER%]==[MinGW] mingw-get update
@@ -72,19 +86,22 @@ install:
 - mkdir build
 - cd build
 
-- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015" -DCMAKE_PREFIX_PATH=../mpir-2.7.0/lib/%PLATFORM%/%BUILD_TYPE% -DCMAKE_CXX_FLAGS_RELEASE="/MT /W1 /O2 /Ob2 /D NDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 /W1" ..
-- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64] cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=../mpir-2.7.0/lib/%PLATFORM%/%BUILD_TYPE% -DCMAKE_CXX_FLAGS_RELEASE="/MT /W1 /O2 /Ob2 /D NDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 /W1" ..
+- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015" -DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\Library ..
+- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64] cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%CONDA_PREFIX%\Library ..
+- if [%COMPILER%]==[MinGW] cmake -G "MinGW Makefiles" -DCMAKE_PREFIX_PATH=C:\MinGW -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
+- if [%COMPILER%]==[MinGW-w64] cmake -G "MinGW Makefiles" -DCMAKE_PREFIX_PATH=C:\mingw64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
 
-- if [%COMPILER%]==[MinGW] cmake -G "MinGW Makefiles" -DCOMMON_DIR=C:\MinGW -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
-- if [%COMPILER%]==[MinGW-w64] cmake -G "MinGW Makefiles" -DWITH_MINGW_W64=yes -DCOMMON_DIR=C:\mingw64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
+- if [%WITH_MPFR%]==[yes] cmake -DWITH_MPFR=yes ..
+- if [%WITH_MPC%]==[yes] cmake -DWITH_MPC=yes ..
+- if [%WITH_LLVM%]==[yes] cmake -DWITH_LLVM=yes -DMSVC_USE_MT=no ..
 
-- cmake -DBUILD_TESTS=no -DBUILD_BENCHMARKS=no ..
+- cmake -DBUILD_SHARED_LIBS=yes -DBUILD_TESTS=no -DBUILD_BENCHMARKS=no -DCMAKE_INSTALL_PREFIX=C:\symengine ..
 
 - cmake --build . --config %BUILD_TYPE% --target install
 - cd ../../
 
 build_script:
-
+- set PATH=C:\symengine\bin\;%PATH%
 - if [%COMPILER%]==[MSVC15] python setup.py install build_ext --compiler=msvc --build-type=%BUILD_TYPE%
 - if [%COMPILER%]==[MinGW] python setup.py install build_ext --compiler=mingw --inplace
 - if [%COMPILER%]==[MinGW-w64] python setup.py install build_ext --compiler=mingw --inplace

bin/install_travis.sh

@@ -1,16 +1,19 @@
 #!/usr/bin/env bash
 
 # symengine's bin/install_travis.sh will install miniconda
+conda update -q -n root conda
+
 export conda_pkgs="python=${PYTHON_VERSION} pip cython sympy nose pytest"
 
 if [[ "${WITH_NUMPY}" != "no" ]]; then
     export conda_pkgs="${conda_pkgs} numpy";
 fi
 
 if [[ "${WITH_SAGE}" == "yes" ]]; then
+    # This is split to avoid the 10 minute limit
+    conda install -q sagelib
     export conda_pkgs="${conda_pkgs} sage";
 fi
 
-conda update -q -n root conda
-conda install ${conda_pkgs} libgap=4.8.3
+conda install -q ${conda_pkgs}
 source activate $our_install_dir;