Compile binding for python 3.13 and 3.14

Author: Géry Casiez

.github/workflows/CI.yml

@@ -6,11 +6,15 @@ on:
   pull_request:
     branches: [ "master" ]
 
-env:
-  PYTHON_VERSION: '3.14'
+x-python-matrix: &python-matrix
+  python-version: ['3.13', '3.14']
 
 jobs:
   buildLinux:
+    strategy:
+      fail-fast: false
+      matrix:
+        <<: *python-matrix
 
     runs-on: ubuntu-latest
     container: ubuntu:latest
@@ -20,7 +24,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v6
       with:
-        python-version: ${{ env.PYTHON_VERSION }}
+        python-version: ${{ matrix.python-version }}
     - name: Install Qt6 and python
       run: |
         apt-get update 
@@ -46,12 +50,16 @@ jobs:
     - name: Save the compiled libraries
       uses: actions/upload-artifact@v5
       with:
-        name: LinuxArtifact
+        name: LinuxArtifact-${{ matrix.python-version }}
         path: |
           pointing/libpointing.a
           bindings/Python/cython/libpointing/*.so
 
   buildMacOS:
+    strategy:
+      fail-fast: false
+      matrix:
+        <<: *python-matrix
 
     runs-on: macos-latest
 
@@ -61,12 +69,12 @@ jobs:
       run: |
         brew update
         brew install qt
-        brew install python@${PYTHON_VERSION}
+        brew install python@${{ matrix.python-version }}
         mkdir venv
-        python${PYTHON_VERSION} -m venv venv/
+        python${{ matrix.python-version }} -m venv venv/
         source venv/bin/activate
-        python${PYTHON_VERSION} -m pip install --upgrade pip
-        python${PYTHON_VERSION} -m pip install setuptools cython
+        python${{ matrix.python-version }} -m pip install --upgrade pip
+        python${{ matrix.python-version }} -m pip install setuptools cython
 
     - name: compile library
       run: |
@@ -79,18 +87,22 @@ jobs:
         source venv/bin/activate
         cp pointing/libpointing.a bindings/Python/cython/
         cd bindings/Python/cython/
-        python${PYTHON_VERSION} buildcythonlib.py build_ext --inplace
+        python${{ matrix.python-version }} buildcythonlib.py build_ext --inplace
         
     - name: Save the compiled libraries
       uses: actions/upload-artifact@v5
       with:
-        name: macOSArtifact
+        name: macOSArtifact-${{ matrix.python-version }}
         path: |
             pointing/libpointing.a
             bindings/Python/cython/libpointing/*.so
 
   buildWindows:
-    
+    strategy:
+      fail-fast: false
+      matrix:
+        <<: *python-matrix
+
     runs-on: windows-latest
 
     steps:
@@ -118,7 +130,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v6
         with:
-            python-version: ${{ env.PYTHON_VERSION }} 
+            python-version: ${{ matrix.python-version }} 
 
       - name: Install Python librairies
         run: |
@@ -147,13 +159,17 @@ jobs:
       - name: Save the compiled libraries
         uses: actions/upload-artifact@v5
         with:
-          name: WindowsArtifact
+          name: WindowsArtifact-${{ matrix.python-version }}
           path: |
             pointing/release/pointing.lib
             bindings/Python/cython/libpointing/*.pyd
 
   buildPythonBinding:
     needs: [buildLinux, buildMacOS, buildWindows]
+    strategy:
+      fail-fast: false
+      matrix:
+        <<: *python-matrix
 
     runs-on: ubuntu-latest
 
@@ -164,7 +180,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v6
         with:
-          python-version: ${{ env.PYTHON_VERSION }}
+          python-version: ${{ matrix.python-version }}
       - name: Install python
         run: |
           apt-get update 
@@ -176,23 +192,26 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install setuptools build cython twine
 
-      - name: Download Linux artifact
+      - name: Download Linux artifacts
         uses: actions/download-artifact@v5
         with:
-          name: LinuxArtifact
+          pattern: LinuxArtifact-*
           path: linux-artifact
+          merge-multiple: true
 
-      - name: Download macOS artifact
+      - name: Download macOS artifacts
         uses: actions/download-artifact@v5
         with:
-            name: macOSArtifact
+            pattern: macOSArtifact-*
             path: macOS-artifact
+            merge-multiple: true
 
-      - name: Download Windows artifact
+      - name: Download Windows artifacts
         uses: actions/download-artifact@v5
         with:
-            name: WindowsArtifact
+            pattern: WindowsArtifact-*
             path: windows-artifact
+            merge-multiple: true
 
       - name: Copy files from artifacts
         run: |
@@ -222,7 +241,7 @@ jobs:
       - name: Save the compiled libraries
         uses: actions/upload-artifact@v5
         with:
-          name: librairiesAndPythonBinding
+          name: librairiesAndPythonBinding-${{ matrix.python-version }}
           path: |
             libraries/
             python/

bindings/Python/cython/pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "libpointing"
-version = "1.1.4"
+version = "1.1.5"
 description = "Python binding for libpointing."
-requires-python = "==3.14.*"
+requires-python = ">=3.13,<3.15"
 authors = [
     {name = "Nicolas Roussel", email = "nicolas.roussel@inria.fr"},
     {name = "Géry Casiez", email = "gery.casiez@univ-lille.fr"},
@@ -15,14 +15,12 @@ authors = [
 maintainers = [
     {name = "Géry Casiez", email = "gery.casiez@univ-lille.fr"},
 ]
-license = {text = "GPLv2"}
+license = "GPL-2.0-only"
 readme = {file = "PIP.md", content-type = "text/markdown"}
 keywords = ["mouse", "hid", "pointing", "input", "device", "transfer function", "subpixel", "raw-input"]
 classifiers = [
          "Programming Language :: Python :: 3",
-         "License :: OSI Approved :: MIT License",
-         "Operating System :: OS Independent",
-         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)"
+         "Operating System :: OS Independent"
 ]
 
 [project.urls]
@@ -33,4 +31,4 @@ packages = ["libpointing"]
 include-package-data = true
 
 [tool.setuptools.package-data]
-libpointing = ["libpointing.cpython-314-darwin.so", "libpointing.cpython-314-x86_64-linux-gnu.so", "libpointing.cp314-win_amd64.pyd"]
+libpointing = ["libpointing.cpython-313-darwin.so", "libpointing.cpython-313-x86_64-linux-gnu.so", "libpointing.cp313-win_amd64.pyd","libpointing.cpython-314-darwin.so", "libpointing.cpython-314-x86_64-linux-gnu.so", "libpointing.cp314-win_amd64.pyd"]