Merge branch 'main' into dependabot/cargo/rstest-0.22

.github/workflows/build.yml

@@ -28,8 +28,6 @@ jobs:
             os: macos-latest
           - vers: x86_64
             os: macos-latest
-          - vers: universal2
-            os: macos-latest
 
           - vers: AMD64
             os: windows-2019
@@ -56,9 +54,13 @@ jobs:
           platforms: arm64
 
       - name: Install darwin target for apple silicon
-        if: matrix.vers == 'universal2' || (matrix.vers == 'arm64' && matrix.os == 'macos-latest')
+        if: matrix.vers == 'arm64' && matrix.os == 'macos-latest'
         run: rustup target add aarch64-apple-darwin
 
+      - name: Install target for apple x86
+        if: matrix.os == 'macos-latest' && matrix.vers == 'x86_64'
+        run: rustup target add x86_64-apple-darwin
+
       - name: Setup env when not using docker
         if: runner.os != 'Linux'
         run: |
@@ -90,6 +92,7 @@ jobs:
 
       - name: Install build dependencies
         run: python -m pip install numpy maturin
+
       - name: Build sdist
         run: maturin sdist -m changeforest-py/Cargo.toml
 
@@ -108,7 +111,7 @@ jobs:
           name: wheels
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@v1.8.14
+      - uses: pypa/gh-action-pypi-publish@v1.9.0
         with:
           user: __token__
           password: ${{ secrets.TESTPYPI_GH_TOKEN }}
@@ -124,7 +127,7 @@ jobs:
           name: wheels
           path: dist
 
-      - uses: pypa/gh-action-pypi-publish@v1.8.14
+      - uses: pypa/gh-action-pypi-publish@v1.9.0
         with:
           user: __token__
           password: ${{ secrets.PYPI_GH_TOKEN }}

changeforest-py/pyproject.toml

@@ -15,6 +15,9 @@ classifiers = [
 requires = ["maturin>=1.0,<2.0"]
 build-backend = "maturin"
 
+[tool.maturin]
+bindings = "pyo3"
+
 [tool.isort]
 multi_line_output = 3
 include_trailing_comma = true