update ci

raphaelsty · May 26, 2024 · ea82298 · ea82298
1 parent b9feb94
commit ea82298
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 47 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -7,7 +7,7 @@ on:
       - "release/*"
 
 jobs:
-  build:
+  build-linux:
     runs-on: ubuntu-latest
 
     strategy:
@@ -29,31 +29,117 @@ jobs:
           toolchain: stable
           override: true
 
-      - name: Install build dependencies
-        run: pip install setuptools-rust
+      - name: Install package dependencies
+        run: pip install setuptools-rust==1.9.0
 
-      - name: Build wheel
-        run: pip wheel .
+      - name: Install build tools
+        run: pip install wheel
 
-      - name: Create source distribution
-        run: python setup.py sdist
+      - name: Build the package
+        run: python setup.py sdist bdist_wheel
+
+      - name: Rename wheels
+        run: |
+          mkdir -p renamed_wheels
+          for whl in dist/*.whl; do
+            mv "$whl" "renamed_wheels/$(basename "$whl" | sed 's/linux/manylinux2014/')"
+          done
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: dist-manylinux2014-${{ matrix.python-version }}
+          path: renamed_wheels/*
+
+  build-macos:
+    runs-on: macos-latest
+
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Rust
+        run: brew install rust
+
+      - name: Install package dependencies
+        run: pip install setuptools-rust==1.9.0
+
+      - name: Install build tools
+        run: pip install wheel
+
+      - name: Build the package
+        run: python setup.py sdist bdist_wheel
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: dist
+          name: dist-macos-${{ matrix.python-version }}
           path: dist/*
 
   publish:
-    needs: build
+    needs: [build-linux, build-macos]
     runs-on: ubuntu-latest
 
     steps:
-      - name: Download artifact
+      - name: Download Linux artifacts for Python 3.8
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-manylinux2014-3.8
+          path: dist/linux/3.8
+
+      - name: Download Linux artifacts for Python 3.9
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-manylinux2014-3.9
+          path: dist/linux/3.9
+
+      - name: Download Linux artifacts for Python 3.10
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-manylinux2014-3.10
+          path: dist/linux/3.10
+
+      - name: Download Linux artifacts for Python 3.11
         uses: actions/download-artifact@v3
         with:
-          name: dist
-          path: dist
+          name: dist-manylinux2014-3.11
+          path: dist/linux/3.11
+
+      - name: Download macOS artifacts for Python 3.8
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-macos-3.8
+          path: dist/macos/3.8
+
+      - name: Download macOS artifacts for Python 3.9
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-macos-3.9
+          path: dist/macos/3.9
+
+      - name: Download macOS artifacts for Python 3.10
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-macos-3.10
+          path: dist/macos/3.10
+
+      - name: Download macOS artifacts for Python 3.11
+        uses: actions/download-artifact@v3
+        with:
+          name: dist-macos-3.11
+          path: dist/macos/3.11
+
+      - name: Combine all artifacts
+        run: mkdir -p final_dist && find dist/ -type f -exec cp {} final_dist/ \;
 
       - name: Set up Python 3.11
         uses: actions/setup-python@v4
@@ -67,4 +153,4 @@ jobs:
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: twine upload dist/*
+        run: twine upload final_dist/*
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ __pycache__/
 cache/
 # C extensions
 *.so
+test/
 
 # Distribution / packaging
 .Python

diff --git a/lenlp/__version__.py b/lenlp/__version__.py
@@ -1,3 +1,3 @@
-VERSION = (1, 0, 0)
+VERSION = (1, 0, 1)
 
 __version__ = ".".join(map(str, VERSION))
diff --git a/pyprojet.toml b/pyprojet.toml
diff --git a/setup.py b/setup.py
@@ -3,9 +3,6 @@
 
 from lenlp.__version__ import __version__
 
-with open("readme.md", "r", encoding="utf-8") as fh:
-    long_description = fh.read()
-
 base_packages = ["scikit-learn  >= 1.5.0", "scipy >= 1.13.1"]
 dev = ["maturin >= 1.5.1", "pytest-cov >= 5.0.0", "pytest >= 7.4.4", "ruff >= 0.1.15"]
 
@@ -15,7 +12,6 @@
     version=f"{__version__}",
     author="Raphael Sourty",
     author_email="[email protected]",
-    long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/raphaelsty/lenlp",
     download_url="https://github.com/raphaelsty/lenlp/archive/v_01.tar.gz",
@@ -30,5 +26,5 @@
     ],
     python_requires=">=3.8",
     rust_extensions=[RustExtension("rslenlp", binding=Binding.PyO3)],
-    setup_requires=["setuptools-rust>=1.4.0", "maturin >= 1.5.1"],
+    setup_requires=["setuptools-rust>=1.9.0"],
 )