nc-gcode-interpreter 0.1.9__tar.gz → 0.1.10__tar.gz

{nc_gcode_interpreter-0.1.9 → nc_gcode_interpreter-0.1.10}/.github/workflows/build-and-release.yml

@@ -7,7 +7,7 @@
 # - build using binary bindings
 # - extract the binaries from the wheel
 # - upload both the wheel and the binary to the release
-# - disable some platforms
+# - disable some platforms 
 
 name: Build and Release
 
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: 3.13
       - name: Install Python linter
         run: pip install ruff
       - name: Lint Python code with ruff
@@ -47,11 +47,12 @@ jobs:
         platform:
           - runner: ubuntu-latest
             target: x86_64
+        python-version: ["3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: ${{ matrix.python-version }}
       - name: Update Cargo.toml Version
         if: startsWith(github.ref, 'refs/tags/')
         run: |
@@ -68,25 +69,40 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-linux-${{ matrix.platform.target }}
+          name: wheels-linux-${{ matrix.platform.target }}-py${{ matrix.python-version }}
           path: dist
 
   test:
     needs: [linux-x64]
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
-          name: wheels-linux-x86_64
+          name: wheels-linux-x86_64-py${{ matrix.python-version }}
           path: dist
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: ${{ matrix.python-version }}
       - name: Install py_opw_kinematics
+        shell: bash
         run: |
-          WHL_FILE=$(ls dist/*cp312*.whl)
-          pip install "${WHL_FILE}[test]"
+          set -e  # Exit on error
+          PY_VERSION="${{ matrix.python-version }}"
+          PY_VERSION_NO_DOT="${PY_VERSION//./}"
+          WHL_FILES=(dist/*cp${PY_VERSION_NO_DOT}*.whl)
+          if [ ${#WHL_FILES[@]} -eq 0 ]; then
+            echo "No matching wheel files found!"
+            exit 1
+          fi
+          if [ ${#WHL_FILES[@]} -gt 1 ]; then
+            echo "Multiple wheel files found: ${WHL_FILES[*]}"
+            exit 1
+          fi
+          pip install "${WHL_FILES[0]}[test]"
       - name: Run tests with pytest
         run: pytest
       - name: Type checking with mypy
@@ -102,23 +118,23 @@ jobs:
           #   target: x86
           - runner: ubuntu-latest
             target: aarch64
-          # - runner: ubuntu-latest
-          #   target: armv7
-          # - runner: ubuntu-latest
-          #   target: s390x
-          # - runner: ubuntu-latest
-          #   target: ppc64le
+        python-version: ["3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: ${{ matrix.python-version }}
       - name: Update Cargo.toml Version
         if: startsWith(github.ref, 'refs/tags/')
+        shell: bash
         run: |
+          set -e  # Exit on error
           VERSION=${GITHUB_REF#refs/tags/v}
           echo "Setting version to $VERSION"
-          sed -i "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml          
+          if ! sed -i "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml; then
+            echo "Failed to update version in Cargo.toml"
+            exit 1
+          fi
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -129,42 +145,9 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-linux-${{ matrix.platform.target }}
+          name: wheels-linux-${{ matrix.platform.target }}-py${{ matrix.python-version }}
           path: dist
 
-
-  # musllinux:
-  #   needs: [lint, test]
-  #   runs-on: ${{ matrix.platform.runner }}
-  #   strategy:
-  #     matrix:
-  #       platform:
-  #         - runner: ubuntu-latest
-  #           target: x86_64
-  #         # - runner: ubuntu-latest
-  #         #   target: x86
-  #         # - runner: ubuntu-latest
-  #         #   target: aarch64
-  #         # - runner: ubuntu-latest
-  #         #   target: armv7
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: actions/setup-python@v5
-  #       with:
-  #         python-version: '>=3.12'
-  #     - name: Build wheels
-  #       uses: PyO3/maturin-action@v1
-  #       with:
-  #         target: ${{ matrix.platform.target }}
-  #         args: --release --out dist --find-interpreter
-  #         sccache: 'true'
-  #         manylinux: musllinux_1_2
-  #     - name: Upload wheels
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         name: wheels-musllinux-${{ matrix.platform.target }}
-  #         path: dist
-
   windows:
     if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
     needs: [lint, test]
@@ -174,21 +157,42 @@ jobs:
         platform:
           - runner: windows-latest
             target: x64
-          # - runner: windows-latest
-          #   target: x86
+        python-version: ["3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: ${{ matrix.python-version }}
           architecture: ${{ matrix.platform.target }}
       - name: Update Cargo.toml Version
         if: startsWith(github.ref, 'refs/tags/')
         shell: pwsh
         run: |
-          $VERSION = $env:GITHUB_REF -replace 'refs/tags/v',''
-          Write-Host "Setting version to $VERSION"
-          (Get-Content Cargo.toml) -replace '^version = ".*"', ('version = "' + $VERSION + '"') | Set-Content Cargo.toml
+          $ErrorActionPreference = "Stop"
+          try {
+            $VERSION = $env:GITHUB_REF -replace 'refs/tags/v',''
+            Write-Host "Setting version to $VERSION"
+
+            # Read Cargo.toml as UTF-8
+            $path = Resolve-Path Cargo.toml
+            $content = [System.IO.File]::ReadAllText($path, [System.Text.Encoding]::UTF8)
+
+            # Update version using multiline regex to match "version ="
+            $newContent = $content -replace '(?m)^\s*version\s*=\s*".*"', "version = `"$VERSION`""
+
+            if ($newContent -eq $content) {
+                throw "Version pattern not found in Cargo.toml"
+            }
+
+            # Write back with UTF-8 encoding
+            [System.IO.File]::WriteAllText($path, $newContent, [System.Text.Encoding]::UTF8)
+            Write-Host "Cargo.toml version updated successfully."
+          }
+          catch {
+            Write-Error "Failed to update version in Cargo.toml: $_"
+            exit 1
+          }
+
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -198,7 +202,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-windows-${{ matrix.platform.target }}
+          name: wheels-windows-${{ matrix.platform.target }}-py${{ matrix.python-version }}
           path: dist
 
   macos:
@@ -208,20 +212,27 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: macos-12
+          - runner: macos-latest
             target: x86_64
-          - runner: macos-14
+          - runner: macos-latest
             target: aarch64
+        python-version: ["3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: 3.12
+          python-version: ${{ matrix.python-version }}
       - name: Update Cargo.toml Version
+        if: startsWith(github.ref, 'refs/tags/')
+        shell: bash
         run: |
+          set -e  # Exit on error
           VERSION=${GITHUB_REF#refs/tags/v}
           echo "Setting version to $VERSION"
-          sed -i '' "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml
+          if ! sed -i '' "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml; then
+            echo "Failed to update version in Cargo.toml"
+            exit 1
+          fi
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
@@ -231,7 +242,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-macos-${{ matrix.platform.target }}
+          name: wheels-macos-${{ matrix.platform.target }}-py${{ matrix.python-version }}
           path: dist
 
   sdist:
@@ -245,10 +256,15 @@ jobs:
           python-version: 3.12
       - name: Update Cargo.toml Version
         if: startsWith(github.ref, 'refs/tags/')
+        shell: bash
         run: |
+          set -e  # Exit on error
           VERSION=${GITHUB_REF#refs/tags/v}
           echo "Setting version to $VERSION"
-            sed -i "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml              
+          if ! sed -i "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml; then
+            echo "Failed to update version in Cargo.toml"
+            exit 1
+          fi
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:

{nc_gcode_interpreter-0.1.9 → nc_gcode_interpreter-0.1.10}/Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "ahash"
@@ -724,7 +724,7 @@ dependencies = [
 
 [[package]]
 name = "nc-gcode-interpreter"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
  "clap",
  "csv",

{nc_gcode_interpreter-0.1.9 → nc_gcode_interpreter-0.1.10}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nc-gcode-interpreter"
-version = "0.1.9"
+version = "0.1.10"
 edition = "2021"
 
 [lib]

{nc_gcode_interpreter-0.1.9 → nc_gcode_interpreter-0.1.10}/PKG-INFO

@@ -1,24 +1,24 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: nc-gcode-interpreter
-Version: 0.1.9
+Version: 0.1.10
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: maturin >=1.7.4
-Requires-Dist: polars[pyarrow] >=1.9.0
-Requires-Dist: jupyter >=1.1.1 ; extra == 'dev'
-Requires-Dist: pytest >=8.3.3 ; extra == 'test'
+Requires-Dist: maturin>=1.7.4
+Requires-Dist: polars[pyarrow]>=1.9.0
+Requires-Dist: jupyter>=1.1.1 ; extra == 'dev'
+Requires-Dist: pytest>=8.3.3 ; extra == 'test'
 Requires-Dist: mypy ; extra == 'test'
 Provides-Extra: dev
 Provides-Extra: test
 License-File: LICENSE
 Summary: A interpreter for NC (Numerical Control) GCode
 Author-email: CEAD Group <software@ceadgroup.com>
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Homepage, https://github.com/CEAD-group/nc-gcode-interpreter
 Project-URL: Repository, https://github.com/CEAD-group/nc-gcode-interpreter.git

{nc_gcode_interpreter-0.1.9 → nc_gcode_interpreter-0.1.10}/pyproject.toml

@@ -7,12 +7,12 @@ name = "nc-gcode-interpreter"
 dynamic = ["version"]
 description = "A interpreter for NC (Numerical Control) GCode"
 authors = [{ name = "CEAD Group", email = "software@ceadgroup.com" }]
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 classifiers = [
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Topic :: Software Development :: Libraries :: Python Modules",