diff --git a/.appveyor.yml b/.appveyor.yml index 1770d871..05d2480d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,7 +4,7 @@ environment: # /E:ON and /V:ON options are not enabled in the batch script intepreter # See: http://stackoverflow.com/a/13751649/163740 CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\run_with_env.cmd" - BOOST_PREFIX: C:\Libraries\boost_1_63_0 + BOOST_PREFIX: C:\Libraries\boost_1_66_0 matrix: @@ -18,15 +18,6 @@ environment: MSVC: "14.0" ARCH: x86 - #- PYTHON: "C:\\Python27-x64" - # PYTHON_VERSION: "2.7.x" # currently 2.7.9 - # PYTHON_ARCH: "64" - # ARCH: "x86_64" - - #- PYTHON: "C:\\Python35" - # PYTHON_VERSION: "3.5.x" # currently 3.4.3 - # PYTHON_ARCH: "32" - - PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.x" PYTHON_ARCH: "64" @@ -34,9 +25,10 @@ environment: ARCH: x86_64 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + PYTHON: "C:\\Python36-x64" PYTHON_VERSION: "3.6.x" PYTHON_ARCH: "64" - MSVC: "14.1" + MSVC: "14.13.26128" ARCH: x86_64 install: @@ -53,8 +45,9 @@ install: - ps: "ls \"C:/\"" - ECHO "Installed libraries:" - ps: "ls \"C:/Libraries/\"" - - ECHO "Installed SDKs:" - - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\"" + ## This path doesn't exist with the VS 2017 worker images + #- ECHO "Installed SDKs:" + #- ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\"" # Install Python (from the official .msi of http://python.org) and pip when # not already installed. @@ -78,13 +71,13 @@ install: # pip will build them from source using the MSVC compiler matching the # target Python version and architecture - | - curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/snapshot/2018-03-07.tar.gz + curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/snapshot/2018-04-08.tar.gz tar xf faber.tar.gz - CD faber-snapshot-2018-03-07 + CD faber-snapshot-2018-04-08 python setup.py install CD .. # report the available MSVC compilers - - python -m faber.tools.msvc + - faber --info=tools cxx - easy_install sphinx - pip install numpy diff --git a/.travis.yml b/.travis.yml index af460c39..04390746 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ install: echo "using cached Boost prerequisites." fi # Install Faber, the build tool. - date=2018-03-07 + date=2018-04-08 wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz tar xf $date.tar.gz pushd faber-snapshot-$date