From d8d9fa24331e596b642ed598d3985db36bdb867b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Flamary?= Date: Fri, 26 Apr 2024 08:25:34 +0200 Subject: [PATCH 01/13] Update build_tests.yml --- .github/workflows/build_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 392bce4ec..0d9ed9c51 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -93,7 +93,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.10"] + python-version: ["3.11"] steps: - uses: actions/checkout@v1 @@ -120,7 +120,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.10"] + python-version: ["3.11"] steps: - uses: actions/checkout@v1 From 424232a1c6fe9f4cfdcc207337c5269e71ef358b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 14:52:18 +0200 Subject: [PATCH 02/13] Update build_tests.yml --- .github/workflows/build_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 0d9ed9c51..b422c531d 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -88,7 +88,7 @@ jobs: uses: codecov/codecov-action@v3 macos: - runs-on: macos-latest + runs-on: macos-latest-large if: "!contains(github.event.head_commit.message, 'no ci')" strategy: max-parallel: 4 From 19026338169cb2153cd63817009e044bd0c478e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 14:56:30 +0200 Subject: [PATCH 03/13] Update build_tests.yml --- .github/workflows/build_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index b422c531d..b345d5435 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -88,7 +88,7 @@ jobs: uses: codecov/codecov-action@v3 macos: - runs-on: macos-latest-large + runs-on: macos-12 if: "!contains(github.event.head_commit.message, 'no ci')" strategy: max-parallel: 4 From c3afb7693d63db7ac12ed8b3783382f0b6bd2ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 15:07:12 +0200 Subject: [PATCH 04/13] Update build_tests.yml --- .github/workflows/build_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index b345d5435..1b3905f43 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -88,7 +88,7 @@ jobs: uses: codecov/codecov-action@v3 macos: - runs-on: macos-12 + runs-on: macos-14 if: "!contains(github.event.head_commit.message, 'no ci')" strategy: max-parallel: 4 From 00002e8d2d61e24ab16e3d5456dfa29c7fe5cc3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 15:08:58 +0200 Subject: [PATCH 05/13] Update build_tests.yml --- .github/workflows/build_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 1b3905f43..541fedf51 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -93,7 +93,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.11"] + python-version: ["3.12"] steps: - uses: actions/checkout@v1 From 510b7afb6ec9ef62dc0e66b52b414976f7b94084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 15:13:05 +0200 Subject: [PATCH 06/13] Update build_tests.yml --- .github/workflows/build_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 541fedf51..d2dae4d42 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -93,7 +93,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.12"] + python-version: ["3.12.3"] steps: - uses: actions/checkout@v1 From 8d47948dcf3ef9b97dc8c87845c167455baa24d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 15:24:21 +0200 Subject: [PATCH 07/13] Update build_tests.yml --- .github/workflows/build_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index d2dae4d42..91d580458 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -88,17 +88,17 @@ jobs: uses: codecov/codecov-action@v3 macos: - runs-on: macos-14 + runs-on: macos-latest if: "!contains(github.event.head_commit.message, 'no ci')" strategy: max-parallel: 4 matrix: - python-version: ["3.12.3"] + python-version: ["3.11"] steps: - uses: actions/checkout@v1 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install POT From f63050393c05795ef5c0c3b6dd014fcdc661e1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 16:51:36 +0200 Subject: [PATCH 08/13] update all versions of checkout and setup-python --- .github/workflows/build_tests.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 91d580458..9bdd337c0 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -25,9 +25,9 @@ jobs: python-version: ["3.8", "3.9", "3.10", "3.11"] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install POT @@ -48,9 +48,9 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, 'no pep8')" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install dependencies @@ -69,9 +69,9 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.head_commit.message, 'no ci')" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install dependencies @@ -96,7 +96,7 @@ jobs: python-version: ["3.11"] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: @@ -123,9 +123,9 @@ jobs: python-version: ["3.11"] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: RC.exe From 3716eba43a2a7339ed16437e1d61218803efad53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 16:53:37 +0200 Subject: [PATCH 09/13] Update build_wheels.yml --- .github/workflows/build_wheels.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index c6c70251b..5e9ef9465 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -18,9 +18,9 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: "3.10" @@ -53,9 +53,9 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.8 - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: "3.10" From f8247338323133537c7fbe6646957e089363a96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 17:26:47 +0200 Subject: [PATCH 10/13] update versions for all builds --- .github/workflows/build_doc.yml | 10 +++++----- .github/workflows/build_tests_cuda.yml | 2 +- .github/workflows/build_wheels.yml | 2 +- .github/workflows/build_wheels_weekly.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 93bd11333..dea536da6 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -13,13 +13,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 # Standard drop-in approach that should work for most people. - - name: Set up Python 3.8 - uses: actions/setup-python@v1 + - name: Set up Python 3.10 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.10 - name: Get Python running run: | @@ -41,4 +41,4 @@ jobs: - uses: actions/upload-artifact@v1 with: name: Documentation - path: docs/build/html/ \ No newline at end of file + path: docs/build/html/ diff --git a/.github/workflows/build_tests_cuda.yml b/.github/workflows/build_tests_cuda.yml index e614aefa8..be8e47c8b 100644 --- a/.github/workflows/build_tests_cuda.yml +++ b/.github/workflows/build_tests_cuda.yml @@ -12,7 +12,7 @@ jobs: if: github.event.review.state == 'approved' || github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/master') steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Install POT run: | python3.10 -m pip install --ignore-installed -e . diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 5e9ef9465..c60babff6 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -54,7 +54,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.8 + - name: Set up Python 3.10 uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/build_wheels_weekly.yml b/.github/workflows/build_wheels_weekly.yml index 5245d41cc..6b2f124fa 100644 --- a/.github/workflows/build_wheels_weekly.yml +++ b/.github/workflows/build_wheels_weekly.yml @@ -17,9 +17,9 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: "3.10" From 1e7451ae8928fd487bb6627820755405b318ed80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 17:36:18 +0200 Subject: [PATCH 11/13] Update build_doc.yml --- .github/workflows/build_doc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index dea536da6..3af2d301f 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" - name: Get Python running run: | From c590c5ac6f51829016ec14ffee7b68dbc618a77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 18:22:56 +0200 Subject: [PATCH 12/13] Update plot_UOT_barycenter_1D.py with deprecated version of pylab --- examples/unbalanced-partial/plot_UOT_barycenter_1D.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/unbalanced-partial/plot_UOT_barycenter_1D.py b/examples/unbalanced-partial/plot_UOT_barycenter_1D.py index f747055cb..de1a3b3d5 100644 --- a/examples/unbalanced-partial/plot_UOT_barycenter_1D.py +++ b/examples/unbalanced-partial/plot_UOT_barycenter_1D.py @@ -120,7 +120,7 @@ pl.figure(3) -cmap = pl.cm.get_cmap('viridis') +cmap = pl.get_cmap('viridis') verts = [] zs = weight_list for i, z in enumerate(zs): @@ -142,7 +142,7 @@ pl.tight_layout() pl.figure(4) -cmap = pl.cm.get_cmap('viridis') +cmap = pl.get_cmap('viridis') verts = [] zs = weight_list for i, z in enumerate(zs): From 07acdf7c6b479dd397b2312a5aeff463e8fea05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Vincent-Cuaz?= Date: Mon, 27 May 2024 18:53:20 +0200 Subject: [PATCH 13/13] Update plot_barycenter_1D.py --- examples/barycenters/plot_barycenter_1D.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/barycenters/plot_barycenter_1D.py b/examples/barycenters/plot_barycenter_1D.py index 40dc44476..7c17c9b22 100644 --- a/examples/barycenters/plot_barycenter_1D.py +++ b/examples/barycenters/plot_barycenter_1D.py @@ -100,7 +100,7 @@ #%% plot interpolation plt.figure(2) -cmap = plt.cm.get_cmap('viridis') +cmap = plt.get_cmap('viridis') verts = [] zs = alpha_list for i, z in enumerate(zs): @@ -122,7 +122,7 @@ plt.tight_layout() plt.figure(3) -cmap = plt.cm.get_cmap('viridis') +cmap = plt.get_cmap('viridis') verts = [] zs = alpha_list for i, z in enumerate(zs):