From 250505909f35a22cd43cf77cf0a97c531ab8eeef Mon Sep 17 00:00:00 2001
From: Tpt <thomaspt@hotmail.fr>
Date: Fri, 15 Jan 2021 21:40:52 +0100
Subject: [PATCH] Python: attempt to fix wheel build in CI

---
 .github/dependabot.yml        |  2 +-
 .github/workflows/build.yml   | 19 ++++++++-----------
 .github/workflows/release.yml | 25 +++++++++----------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d16b20b8..4f0bb795 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -15,7 +15,7 @@ updates:
     schedule:
       interval: daily
   - package-ecosystem: gitsubmodule
-    directory: "/testsuite/rdf-tests"
+    directory: "/"
     schedule:
       interval: daily
   - package-ecosystem: docker
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9ee22c69..85a93961 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,20 +78,17 @@ jobs:
       - run: docker run --rm -v $(pwd):/io konstin2/maturin build
         working-directory: ./python
 
-  python_wheel_mac:
-    runs-on: macos-latest
-    needs: python
-    steps:
-      - uses: actions/checkout@v2
-      - run: pip3 install maturin
-      - run: python3 -m maturin build --no-sdist
-        working-directory: ./python
-
-  python_wheel_windows:
-    runs-on: windows-latest
+  python_wheel_mac_windows:
+    runs-on: ${{ matrix.os }}
     needs: python
+    strategy:
+      matrix:
+        os: [ macos-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.6
       - run: pip install maturin
       - run: maturin build --no-sdist
         working-directory: ./python
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6af7c5e3..58f7eca2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,7 +63,7 @@ jobs:
           CRATES_IO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
       - run: cargo publish
         working-directory: ./wikibase
-  publish_pypi:
+  publish_pypi_linux:
     runs-on: ubuntu-latest
     needs: publish_lib_crate
     steps:
@@ -76,24 +76,17 @@ jobs:
           user: __token__
           password: ${{ secrets.PYPI_PASSWORD }}
           packages_dir: ./python/target/wheels
-  publish_pypi_mac:
-    runs-on: macos-latest
-    needs: publish_lib_crate
+  publish_pypi_mac_windows:
+    runs-on: ${{ matrix.os }}
+    needs: python
+    strategy:
+      matrix:
+        os: [ macos-latest, windows-latest ]
     steps:
       - uses: actions/checkout@v2
-      - run: pip3 install maturin
-      - run: python3 -m maturin build --release --no-sdist
-        working-directory: ./python
-      - uses: pypa/gh-action-pypi-publish@v1.4.1
+      - uses: actions/setup-python@v2
         with:
-          user: __token__
-          password: ${{ secrets.PYPI_PASSWORD }}
-          packages_dir: ./target/wheels
-  publish_pypi_windows:
-    runs-on: windows-latest
-    needs: publish_lib_crate
-    steps:
-      - uses: actions/checkout@v2
+          python-version: 3.6
       - run: pip install maturin
       - run: maturin build --release --no-sdist
         working-directory: ./python