Skip to content

Commit 1335a19

Browse files
committed
Update xtensor
1 parent bd12632 commit 1335a19

File tree

2 files changed

+9
-27
lines changed

2 files changed

+9
-27
lines changed

.appveyor.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ init:
1919
- "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%MINICONDA%\\Library\\bin;%PATH%"
2020
# Download most recent Julia Windows binary
2121
- ps: if($env:Platform -eq "x64"){(new-object net.webclient).DownloadFile(
22-
$("https://julialang-s3.julialang.org/bin/winnt/x64/1.2/julia-1.2.0-win64.exe"),
22+
$("https://julialang-s3.julialang.org/bin/winnt/x64/1.6/julia-1.6.3-win64.exe"),
2323
"C:\projects\julia-binary.exe")}
2424
- ps: if($env:Platform -eq "x86"){(new-object net.webclient).DownloadFile(
25-
$("https://julialang-s3.julialang.org/bin/winnt/x86/1.2/julia-1.2.0-win32.exe"),
25+
$("https://julialang-s3.julialang.org/bin/winnt/x86/1.6/julia-1.6.3-win32.exe"),
2626
"C:\projects\julia-binary.exe")}
2727
# Run installer silently, output to C:\projects\julia-build
2828
- C:\projects\julia-binary.exe /S /D=C:\projects\julia-build
@@ -33,9 +33,9 @@ install:
3333
- conda update -q conda
3434
- conda info -a
3535
- conda install gtest cmake -c conda-forge
36-
- conda install xtensor==0.21.2 -c conda-forge
36+
- conda install xtensor==0.24.0 -c conda-forge
3737
# Install CxxWrap
38-
- C:\projects\julia-build\bin\julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.8.2\"))"
38+
- C:\projects\julia-build\bin\julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))"
3939
# Retrieve JlCxx_DIR from CxxWrap
4040
- C:\projects\julia-build\bin\julia -E "using CxxWrap; joinpath(dirname(pathof(CxxWrap)), \"..\", \"deps\", \"usr\", \"lib\", \"cmake\", \"JlCxx\")" > temp.txt
4141
- set /p JlCxx_DIR=<temp.txt

.travis.yml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,6 @@ sudo: required
33
language: julia
44
matrix:
55
include:
6-
- os: linux
7-
addons:
8-
apt:
9-
sources:
10-
- ubuntu-toolchain-r-test
11-
packages:
12-
- g++-5
13-
env: COMPILER=gcc GCC=5
14-
julia: 1.0.1
15-
- os: linux
16-
addons:
17-
apt:
18-
sources:
19-
- ubuntu-toolchain-r-test
20-
packages:
21-
- g++-6
22-
env: COMPILER=gcc GCC=6
23-
julia: 1.1.1
246
- os: linux
257
addons:
268
apt:
@@ -29,7 +11,7 @@ matrix:
2911
packages:
3012
- g++-7
3113
env: COMPILER=gcc GCC=7
32-
julia: 1.2.0
14+
julia: 1.6.3
3315
- os: linux
3416
addons:
3517
apt:
@@ -42,11 +24,11 @@ matrix:
4224
- os: osx
4325
osx_image: xcode8
4426
compiler: clang
45-
julia: 1.1.1
27+
julia: 1.6.3
4628
- os: osx
4729
osx_image: xcode8
4830
compiler: clang
49-
julia: 1.1.1
31+
julia: 1.6.3
5032
allow_failures:
5133
- julia: nightly
5234
env:
@@ -84,10 +66,10 @@ install:
8466
- conda info -a
8567
# Install xtensor and other conda requirements
8668
- conda install cmake -c conda-forge
87-
- conda install xtensor==0.21.2 -c conda-forge
69+
- conda install xtensor==0.24.0 -c conda-forge
8870
# Install CxxWrap
8971
# TODO: switch to standalone libcxxwrap-julia
90-
- julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.8.2\"))"
72+
- julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.8.3\"))"
9173
# Retrieve JlCxx_DIR from CxxWrap
9274
- JlCxx_DIR=$(julia -E "using CxxWrap; joinpath(dirname(pathof(CxxWrap)), \"..\", \"deps\", \"usr\", \"lib\", \"cmake\", \"JlCxx\")")
9375
- JlCxx_DIR=${JlCxx_DIR//\"/}

0 commit comments

Comments
 (0)