Merge branch 'master' into barycenter_refactor

JuliaOptimalTransport · Aug 24, 2021 · 6e14eda · 6e14eda
2 parents 9d8d758 + 5354fb6
commit 6e14eda
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -29,6 +29,14 @@ jobs:
             coverage: true
     steps:
       - uses: actions/checkout@v2
+      - name: Install python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+          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:
           version: ${{ matrix.version }}
@@ -48,7 +56,7 @@ jobs:
         with:
           coverage: ${{ matrix.coverage || false }}
         env:
-          PYTHON: '' # Use Conda.jl also on Linux
+          PYTHON: python
           GROUP: OptimalTransport
       - uses: julia-actions/julia-processcoverage@v1
         if: matrix.coverage

diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml
@@ -12,6 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Install python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+          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:
           version: '1'
@@ -24,6 +32,5 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
           DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
-          PYTHON: '' # Use Conda.jl also on Linux
           GKSwstype: nul # avoid (irrelevant) error messages from GR
         shell: julia --color=yes --project=docs/ {0}