From 1289346d7e3800b17d5939135e67db6d64603721 Mon Sep 17 00:00:00 2001
From: Tpt <thomaspt@hotmail.fr>
Date: Sun, 4 Apr 2021 08:48:56 +0200
Subject: [PATCH] Fixes CI by preventing usage of maturin 0.10

---
 .github/workflows/build.yml   | 6 +++---
 .github/workflows/doc.yml     | 2 +-
 .github/workflows/release.yml | 8 ++++----
 python/README.md              | 2 +-
 python/pyproject.toml         | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b3642de3..0e5e9c97 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
         with:
           python-version: 3.8
       - run: python -m venv python/venv
-      - run: source python/venv/bin/activate && pip install --upgrade pip maturin sphinx
+      - run: source python/venv/bin/activate && pip install --upgrade pip 'maturin>=0.9.2,<0.10' sphinx
       - run: source venv/bin/activate && maturin develop
         working-directory: ./python
       - run: source ../venv/bin/activate && python -m unittest
@@ -80,6 +80,6 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.6
-      - run: pip install maturin
-      - run: maturin build
+      - run: pip install 'maturin>=0.9.2,<0.10'
+      - run: maturin build --universal2
         working-directory: ./python
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index 8fdb3579..ac4d9ff5 100644
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -15,7 +15,7 @@ jobs:
         with:
           python-version: 3.8
       - run: python -m venv python/venv
-      - run: source python/venv/bin/activate && pip install --upgrade pip maturin sphinx
+      - run: source python/venv/bin/activate && pip install --upgrade pip 'maturin>=0.9.2,<0.10' sphinx
       - run: source venv/bin/activate && maturin develop
         working-directory: ./python
       - run: source ../venv/bin/activate && sphinx-build -M doctest . build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8f7b4fa5..cb0e0e84 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -85,7 +85,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: sed -i 's/path="..\/lib", //g' python/Cargo.toml
-      - run: docker run --rm -v $(pwd):/io konstin2/maturin publish -u __token__ -p ${{ secrets.PYPI_PASSWORD }}
+      - run: docker run --rm -v $(pwd):/io konstin2/maturin:v0.9.4 publish -u __token__ -p ${{ secrets.PYPI_PASSWORD }}
         working-directory: ./python
   publish_pypi_mac_windows:
     runs-on: ${{ matrix.os }}
@@ -98,8 +98,8 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.6
-      - run: pip install maturin
-      - run: maturin publish --no-sdist -u __token__ -p ${{ secrets.PYPI_PASSWORD }}
+      - run: pip install 'maturin>=0.9.2,<0.10'
+      - run: maturin publish --universal2 --no-sdist -u __token__ -p ${{ secrets.PYPI_PASSWORD }}
         working-directory: ./python
   publish_npm:
     runs-on: ubuntu-latest
@@ -128,7 +128,7 @@ jobs:
         with:
           python-version: 3.8
       - run: python -m venv python/venv
-      - run: source python/venv/bin/activate && pip install --upgrade pip maturin sphinx
+      - run: source python/venv/bin/activate && pip install --upgrade pip 'maturin>=0.9.2,<0.10' sphinx
       - run: source venv/bin/activate && maturin develop
         working-directory: ./python
       - run: source ../venv/bin/activate && sphinx-build -M doctest . build
diff --git a/python/README.md b/python/README.md
index ca14230c..bfdc9f04 100644
--- a/python/README.md
+++ b/python/README.md
@@ -37,7 +37,7 @@ and to run `pip install .` in the `python` directory (the one this README is in)
 Pyoxigraph is written in Rust using [PyO3](https://github.com/PyO3/pyo3).
 
 Pyoxigraph is built using [Maturin](https://github.com/PyO3/maturin).
-Maturin could be installed using the `pip install maturin`.
+Maturin could be installed using the `pip install 'maturin>=0.9,<0.10'`.
 To install a development version of Oxigraph just run `maturin develop` in this README directory.
 
 The Python bindings tests are written in Python.
diff --git a/python/pyproject.toml b/python/pyproject.toml
index 4e7713f7..912a19e9 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
-requires = ["maturin>=0.9,<0.10"]
+requires = ["maturin>=0.9.2,<0.10"]
 build-backend = "maturin"
\ No newline at end of file