Merge pull request #16 from Eeems-Org/Eeems-patch-1

Update version, upload manylinux wheels to pypi

Author: Eeems

.github/workflows/build.yml

@@ -17,7 +17,6 @@ jobs:
         python:
           - '3.11'
           - '3.12'
-          - '3.13'
     steps:
       - name: Install Apt packages
         id: cache-apt
@@ -26,10 +25,6 @@ jobs:
           execute_install_scripts: true
           packages: libfuse-dev
           version: 1.0
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v3
-        with:
-          version: "25.x"
       - name: Checkout the Git repository
         uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -61,10 +56,6 @@ jobs:
           execute_install_scripts: true
           packages: libfuse-dev ccache
           version: 1.0
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v3
-        with:
-          version: "25.x"
       - name: Checkout the Git repository
         uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -107,7 +98,6 @@ jobs:
             fuse-dev
             git
             patchelf
-            protoc
       - name: Nuitka ccache
         uses: actions/cache@v4
         with:
@@ -186,7 +176,6 @@ jobs:
         python:
           - '3.11'
           - '3.12'
-          - '3.13'
     steps:
       - name: Checkout the Git repository
         uses: actions/checkout@v4
@@ -195,18 +184,24 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
           cache: 'pip'
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v3
-        with:
-          version: "25.x"
-      - name: Install build tool
-        run: pip install build
       - name: Building package
-        run: make wheel
+        run: |
+          python_version=${{ matrix.python }}
+          python_version=cp${python_version//.}
+          script=$(cat <<EOF
+          cd /src;
+          export PATH=\$PATH:/opt/python/$python_version-$python_version/bin;
+          make ${{ env.FLAGS }} wheel;
+          auditwheel repair dist/*.whl;
+          EOF
+          )
+          docker run -v $(pwd):/src \
+            quay.io/pypa/manylinux_2_34_x86_64:latest \
+            /bin/bash -c "$script"
       - uses: actions/upload-artifact@v4
         with:
           name: pip-wheel-${{ matrix.python }}
-          path: dist/*
+          path: wheelhouse/*
           if-no-files-found: error
   build-sdist:
     name: Build sdist
@@ -220,10 +215,6 @@ jobs:
         with:
           python-version: '3.11'
           cache: 'pip'
-      - name: Install Protoc
-        uses: arduino/setup-protoc@v3
-        with:
-          version: "25.x"
       - name: Install build tool
         run: pip install build
       - name: Building package
@@ -236,8 +227,16 @@ jobs:
   publish:
     name: Publish to PyPi
     if: github.repository == 'Eeems-Org/remarkable-update-fuse' && github.event_name == 'release' && startsWith(github.ref, 'refs/tags')
-    needs: [build-sdist]
+    needs:
+      - build-sdist
+      - build-wheel
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        artifact:
+          - 'pip-sdist'
+          - 'pip-wheel-3.11'
+          - 'pip-wheel-3.12'
     permissions:
       id-token: write
       contents: write
@@ -249,7 +248,7 @@ jobs:
         id: download
         uses: actions/download-artifact@v4
         with:
-          name: pip-sdist
+          name: ${{ matrix.artifact }}
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
@@ -274,7 +273,6 @@ jobs:
           - 'pip-sdist'
           - 'pip-wheel-3.11'
           - 'pip-wheel-3.12'
-          - 'pip-wheel-3.13'
     permissions:
       contents: write
     steps:

pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "remarkable_update_fuse"
-version = "1.2.2"
+version = "1.2.3"
 authors = [
   { name="Eeems", email="[email protected]" },
 ]
 description = "Userspace filesystem for remarkable update files"
-requires-python = ">=3.11"
+requires-python = ">=3.11,<3.13"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Console",
@@ -41,5 +41,5 @@ dependencies = {file = ["requirements.txt"]}
 readme = {file= ["README.md"], content-type = "text/markdown"}
 
 [build-system]
-requires = ["setuptools>=42", "wheel", "nuitka", "toml"]
+requires = ["setuptools>=42", "wheel", "nuitka"]
 build-backend = "nuitka.distutils.Build"

requirements.txt

@@ -1,2 +1,2 @@
-fuse-python==1.0.7
-remarkable-update-image==1.1.3
+fuse-python==1.0.9
+remarkable-update-image==1.1.4