Skip to content

Commit cc229bd

Browse files
authored
Merge branch 'master' into ot_circle
2 parents 6d98395 + 1078dcc commit cc229bd

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

.github/workflows/build_tests.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ jobs:
3737
run: |
3838
python -m pip install --upgrade pip
3939
pip install -r requirements.txt
40-
pip install pytest "pytest-cov<2.6" codecov
40+
pip install pytest pytest-cov
4141
- name: Run tests
4242
run: |
43-
python -m pytest --durations=20 -v test/ ot/ --doctest-modules --ignore ot/gpu/ --cov=ot --color=yes
44-
- name: Upload codecov
45-
run: |
46-
codecov
43+
python -m pytest --durations=20 -v test/ ot/ --doctest-modules --color=yes --cov-report=xml
44+
- name: Upload coverage reports to Codecov with GitHub Action
45+
uses: codecov/codecov-action@v3
4746

4847
pep8:
4948
runs-on: ubuntu-latest

.github/workflows/circleci-redirector.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ on: [status]
33
jobs:
44
circleci_artifacts_redirector_job:
55
runs-on: ubuntu-latest
6+
if: "${{ github.event.context == 'ci/circleci: build_docs' }}"
67
name: Run CircleCI artifacts redirector
78
steps:
89
- name: GitHub Action step
910
uses: larsoner/circleci-artifacts-redirector-action@master
1011
with:
12+
api-token: ${{ secrets.CIRCLE_TOKEN }}
1113
repo-token: ${{ secrets.GITHUB_TOKEN }}
1214
artifact-path: 0/dev/index.html
1315
circleci-jobs: build_docs

RELEASES.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Releases
22

3+
## 0.9.1dev
4+
5+
#### New features
6+
7+
#### Closed issues
8+
9+
- Fix circleci-redirector action and codecov (PR #460)
10+
311
## 0.9.0
412

513
This new release contains so many new features and bug fixes since 0.8.2 that we
@@ -93,7 +101,7 @@ big. More details below.
93101
- Added parameters method in `ot.da.SinkhornTransport` (PR #440)
94102
- `ot.dr` now uses the new Pymanopt API and POT is compatible with current
95103
Pymanopt (PR #443)
96-
- Added CO-Optimal Transport solver + examples (PR # 447)
104+
- Added CO-Optimal Transport solver + examples (PR #447)
97105
- Remove the redundant `nx.abs()` at the end of `wasserstein_1d()` (PR #448)
98106

99107
#### Closed issues

ot/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
# utils functions
5656
from .utils import dist, unif, tic, toc, toq
5757

58-
__version__ = "0.9.0"
58+
__version__ = "0.9.1dev"
5959

6060
__all__ = ['emd', 'emd2', 'emd_1d', 'sinkhorn', 'sinkhorn2', 'utils',
6161
'datasets', 'bregman', 'lp', 'tic', 'toc', 'toq', 'gromov',

0 commit comments

Comments
 (0)