Skip to content

Commit de56119

Browse files
authored
Update dependencies and CI (#158)
* Update dependencies * Update manifest files * Update CI * Fix documentation by reexporting `discretemeasure` * Try to fix test error by weaker tolerance * Simplify CI
1 parent 40a1808 commit de56119

File tree

14 files changed

+2128
-1892
lines changed

14 files changed

+2128
-1892
lines changed

.github/workflows/CI.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ on:
66
- master
77
pull_request:
88

9+
concurrency:
10+
# Skip intermediate builds: always.
11+
# Cancel intermediate builds: only if it is a pull request build.
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
14+
915
jobs:
1016
test:
1117
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
@@ -22,20 +28,13 @@ jobs:
2228
- windows-latest
2329
arch:
2430
- x64
25-
include:
26-
- version: '1'
27-
os: ubuntu-latest
28-
arch: x64
29-
coverage: true
3031
steps:
3132
- uses: actions/checkout@v2
3233
- name: Install python
3334
uses: actions/setup-python@v2
3435
with:
3536
python-version: '3.9'
3637
architecture: ${{ matrix.arch }}
37-
# Limitation of pip: https://pythonot.github.io/index.html#pip-installation
38-
- run: python -m pip install cython numpy
3938
- run: python -m pip install pot
4039
- uses: julia-actions/setup-julia@v1
4140
with:
@@ -54,18 +53,18 @@ jobs:
5453
- uses: julia-actions/julia-buildpkg@latest
5554
- uses: julia-actions/julia-runtest@latest
5655
with:
57-
coverage: ${{ matrix.coverage || false }}
56+
coverage: ${{ matrix.version == '1' && matrix.os == 'ubuntu-latest' }}
5857
env:
5958
PYTHON: python
6059
GROUP: OptimalTransport
6160
- uses: julia-actions/julia-processcoverage@v1
62-
if: matrix.coverage
63-
- uses: codecov/codecov-action@v1
64-
if: matrix.coverage
61+
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
62+
- uses: codecov/codecov-action@v2
63+
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
6564
with:
6665
file: lcov.info
6766
- uses: coverallsapp/github-action@master
68-
if: matrix.coverage
67+
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
6968
with:
7069
github-token: ${{ secrets.GITHUB_TOKEN }}
7170
path-to-lcov: lcov.info

.github/workflows/Documentation.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ on:
77
tags: '*'
88
pull_request:
99

10+
concurrency:
11+
# Skip intermediate builds: always.
12+
# Cancel intermediate builds: only if it is a pull request build.
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
15+
1016
jobs:
1117
build:
1218
runs-on: ubuntu-latest
@@ -17,8 +23,6 @@ jobs:
1723
with:
1824
python-version: '3.9'
1925
architecture: ${{ matrix.arch }}
20-
# Limitation of pip: https://pythonot.github.io/index.html#pip-installation
21-
- run: python -m pip install cython numpy
2226
- run: python -m pip install pot
2327
- uses: julia-actions/setup-julia@latest
2428
with:

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "OptimalTransport"
22
uuid = "7e02d93a-ae51-4f58-b602-d97af76e3b33"
33
authors = ["zsteve <stephenz@student.unimelb.edu.au>"]
4-
version = "0.3.17"
4+
version = "0.3.18"
55

66
[deps]
77
ExactOptimalTransport = "24df6009-d856-477c-ac5c-91f668376b31"
@@ -12,7 +12,7 @@ NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
1212
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1313

1414
[compat]
15-
ExactOptimalTransport = "0.1"
15+
ExactOptimalTransport = "0.1, 0.2"
1616
IterativeSolvers = "0.8.4, 0.9"
1717
LogExpFunctions = "0.2, 0.3"
1818
NNlib = "0.6, 0.7"

0 commit comments

Comments
 (0)