Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1cb9b0e

Browse filesBrowse files
committed
Update xtensor
1 parent 552a851 commit 1cb9b0e
Copy full SHA for 1cb9b0e

File tree

Expand file treeCollapse file tree

5 files changed

+44
-136
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+44
-136
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
-45Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.github/workflows/main.yml

Copy file name to clipboard
+37Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: CI
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
jobs:
12+
unix:
13+
14+
runs-on: ${{ matrix.os }}
15+
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
os: [ubuntu-20.04, macos-10.15]
20+
include:
21+
- os: ubuntu-20.04
22+
23+
steps:
24+
- uses: actions/checkout@v2
25+
- name: Get number of CPU cores
26+
uses: SimenB/github-actions-cpu-cores@v1
27+
28+
- name: Build Xtensor.jl
29+
shell: bash -l {0}
30+
run: |
31+
julia -E "using Pkg; Pkg.add(PackageSpec(name=\"CxxWrap\", version=\"0.11.2\"))"
32+
julia --project=. -E "using Pkg; Pkg.build()"
33+
34+
- name: Test Xtensor.jl
35+
shell: bash -l {0}
36+
run: |
37+
julia --project=. -E "using Pkg; Pkg.test()"

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
-67Lines changed: 0 additions & 67 deletions
This file was deleted.

‎README.md

Copy file name to clipboardExpand all lines: README.md
+3-20Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# ![Xtensor.jl](xtensor-julia.svg)
22

3-
[![Travis](https://travis-ci.org/xtensor-stack/Xtensor.jl.svg?branch=master)](https://travis-ci.org/xtensor-stack/Xtensor.jl)
4-
[![Apveyor](https://ci.appveyor.com/api/projects/status/988jlhgfnsanms6v?svg=true)](https://ci.appveyor.com/project/xtensor-stack/xtensor-jl)
53
[![Documentation Status](http://readthedocs.org/projects/xtensor-julia/badge/?version=latest)](https://xtensor-julia.readthedocs.io/en/latest/?badge=latest)
64
[![Join the Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/QuantStack/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
75

@@ -149,28 +147,13 @@ make html
149147

150148
from the `docs` subdirectory.
151149

152-
## Running the C++ tests
153-
154-
From `deps/build`
155-
156-
```
157-
cmake -D JlCxx_DIR=/path/to/.julia/v1.1/CxxWrap/deps/usr/lib/cmake/JlCxx -D BUILD_TESTS=ON ..
158-
```
159-
160150
## Dependencies on `xtensor`, `xtensor-julia`, and `CxxWrap`
161151

162152
`Xtensor.jl` depends on `xtensor-julia`, `xtensor` and `CxxWrap` libraries
163153

164-
| `Xtensor.jl` | `xtensor` | `xtensor-julia` | `CxxWrap` |
165-
|--------------|----------------|-----------------|--------------|
166-
| master | >=0.20.8,<0.21 | 0.8.4 | >=0.8.1,<0.9 |
167-
| 0.8.2 | >=0.20.8,<0.21 | 0.8.4 | >=0.8.1,<0.9 |
168-
| 0.8.1 | >=0.20.4,<0.21 | 0.8.2 | >=0.8.1,<0.9 |
169-
| 0.8.0 | >=0.20.4,<0.21 | 0.8.2 | >=0.8.1,<0.9 |
170-
| 0.7.0 | >=0.19.0,<0.20 | 0.7.0 | >=0.8.1,<0.9 |
171-
| 0.6.2 | >=0.18.3,<0.19 | 0.6.2 | >=0.8.1,<0.9 |
172-
| 0.6.1 | >=0.18.1,<0.19 | 0.6.0 | >=0.8.1,<0.9 |
173-
| 0.6.0 | >=0.18.1,<0.19 | 0.6.0 | >=0.8.1,<0.9 |
154+
| `Xtensor.jl` | `xtensor` | `xtensor-julia` | `CxxWrap` |
155+
|--------------|----------------|-----------------|----------------|
156+
| master | >=0.24.0,<0.25 | 0.10.0 | >=0.11.2,<0.12 |
174157

175158
These dependencies are automatically resolved when using the Julia package manager.
176159

‎deps/build.jl

Copy file name to clipboardExpand all lines: deps/build.jl
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ using CxxWrap
55

66
build_type = "Release"
77

8-
jlcxx_cmake_dir = joinpath(dirname(pathof(CxxWrap)), "..", "deps", "usr", "lib", "cmake", "JlCxx")
8+
jlcxx_cmake_dir = joinpath(CxxWrap.prefix_path(), "lib", "cmake", "JlCxx")
99
xtl_cmake_dir = joinpath(dirname(@__FILE__), "usr", "lib", "cmake", "xtl")
1010
xtensor_cmake_dir = joinpath(dirname(@__FILE__), "usr", "lib", "cmake", "xtensor")
1111
julia_bindir = Sys.BINDIR
@@ -46,13 +46,13 @@ for l in example_labels
4646
end
4747

4848
# Version of xtl to vendor
49-
xtl_version = "0.6.5"
49+
xtl_version = "0.7.4"
5050

5151
# Version of xtensor to vendor
52-
xtensor_version = "0.20.8"
52+
xtensor_version = "0.24.0"
5353

5454
# Version of xtensor-julia to vendor
55-
xtensor_julia_version = "0.8.4"
55+
xtensor_julia_version = "0.10.1"
5656

5757
xtl_steps = @build_steps begin
5858
`git clone -b $xtl_version --single-branch https://github.com/QuantStack/xtl $xtl_srcdir`

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.