Skip to content

Commit

Permalink
Update dependencies and CI (#158)
Browse files Browse the repository at this point in the history
* Update dependencies

* Update manifest files

* Update CI

* Fix documentation by reexporting `discretemeasure`

* Try to fix test error by weaker tolerance

* Simplify CI
  • Loading branch information
devmotion committed Dec 25, 2021
1 parent 40a1808 commit de56119
Show file tree
Hide file tree
Showing 14 changed files with 2,128 additions and 1,892 deletions.
23 changes: 11 additions & 12 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ on:
- master
pull_request:

concurrency:
# Skip intermediate builds: always.
# Cancel intermediate builds: only if it is a pull request build.
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
Expand All @@ -22,20 +28,13 @@ jobs:
- windows-latest
arch:
- x64
include:
- version: '1'
os: ubuntu-latest
arch: x64
coverage: true
steps:
- uses: actions/checkout@v2
- name: Install python
uses: actions/setup-python@v2
with:
python-version: '3.9'
architecture: ${{ matrix.arch }}
# Limitation of pip: https://pythonot.github.io/index.html#pip-installation
- run: python -m pip install cython numpy
- run: python -m pip install pot
- uses: julia-actions/setup-julia@v1
with:
Expand All @@ -54,18 +53,18 @@ jobs:
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
with:
coverage: ${{ matrix.coverage || false }}
coverage: ${{ matrix.version == '1' && matrix.os == 'ubuntu-latest' }}
env:
PYTHON: python
GROUP: OptimalTransport
- uses: julia-actions/julia-processcoverage@v1
if: matrix.coverage
- uses: codecov/codecov-action@v1
if: matrix.coverage
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
- uses: codecov/codecov-action@v2
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
with:
file: lcov.info
- uses: coverallsapp/github-action@master
if: matrix.coverage
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: lcov.info
8 changes: 6 additions & 2 deletions .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ on:
tags: '*'
pull_request:

concurrency:
# Skip intermediate builds: always.
# Cancel intermediate builds: only if it is a pull request build.
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -17,8 +23,6 @@ jobs:
with:
python-version: '3.9'
architecture: ${{ matrix.arch }}
# Limitation of pip: https://pythonot.github.io/index.html#pip-installation
- run: python -m pip install cython numpy
- run: python -m pip install pot
- uses: julia-actions/setup-julia@latest
with:
Expand Down
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimalTransport"
uuid = "7e02d93a-ae51-4f58-b602-d97af76e3b33"
authors = ["zsteve <stephenz@student.unimelb.edu.au>"]
version = "0.3.17"
version = "0.3.18"

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

[compat]
ExactOptimalTransport = "0.1"
ExactOptimalTransport = "0.1, 0.2"
IterativeSolvers = "0.8.4, 0.9"
LogExpFunctions = "0.2, 0.3"
NNlib = "0.6, 0.7"
Expand Down
Loading

2 comments on commit de56119

@devmotion
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/51209

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.3.18 -m "<description of version>" de56119273bde20e79cc8ae65b1e2292e6234b8c
git push origin v0.3.18

Please sign in to comment.