nc-gcode-interpreter 0.1.4__tar.gz → 0.1.7__tar.gz

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/.github/workflows/build-and-release.yml

@@ -13,44 +13,115 @@ name: Build and Release
 
 on:
   push:
+    branches:
+      - main
     tags:
       - 'v*'
+  pull_request:
   workflow_dispatch:
 
+
 permissions:
   contents: write
 
 env:
   PROJECT_NAME: "nc-gcode-interpreter"
-
 jobs:
-  linux:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Install Python linter
+        run: pip install ruff
+      - name: Lint Python code with ruff
+        run: ruff check .
+
+  linux-x64:
+    needs: [lint]
     runs-on: ${{ matrix.platform.runner }}
     strategy:
       matrix:
         platform:
           - runner: ubuntu-latest
             target: x86_64
-        #   - runner: ubuntu-latest
-        #     target: x86
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Update Cargo.toml Version
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          echo "Setting version to $VERSION"
+          sed -i "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+          manylinux: auto
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-linux-${{ matrix.platform.target }}
+          path: dist
+
+  test:
+    needs: [linux-x64]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+        with:
+          name: wheels-linux-x86_64
+          path: dist
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Install py_opw_kinematics
+        run: |
+          WHL_FILE=$(ls dist/*cp312*.whl)
+          pip install "${WHL_FILE}[test]"
+      - name: Run tests with pytest
+        run: pytest
+
+  linux:
+    if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
+    needs: [lint, test]
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          # - runner: ubuntu-latest
+          #   target: x86
           - runner: ubuntu-latest
             target: aarch64
-        #   - runner: ubuntu-latest
-        #     target: armv7
-        #   - runner: ubuntu-latest
-        #     target: s390x
-        #   - runner: ubuntu-latest
-        #     target: ppc64le
+          # - runner: ubuntu-latest
+          #   target: armv7
+          # - runner: ubuntu-latest
+          #   target: s390x
+          # - runner: ubuntu-latest
+          #   target: ppc64le
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
+      - name: Update Cargo.toml Version
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          echo "Setting version to $VERSION"
+          sed -i "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml          
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          # args: --release --out dist --find-interpreter -b bin
           args: --release --out dist --find-interpreter
           sccache: 'true'
           manylinux: auto
@@ -60,58 +131,67 @@ jobs:
           name: wheels-linux-${{ matrix.platform.target }}
           path: dist
 
-#   musllinux:
-#     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 -b bin
-#           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
+
+  # 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]
     runs-on: ${{ matrix.platform.runner }}
     strategy:
       matrix:
         platform:
           - runner: windows-latest
             target: x64
-        #   - runner: windows-latest
-        #     target: x86
+          # - runner: windows-latest
+          #   target: x86
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
           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
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          # args: --release --out dist --find-interpreter -b bin
           args: --release --out dist --find-interpreter
           sccache: 'true'
       - name: Upload wheels
@@ -121,6 +201,8 @@ jobs:
           path: dist
 
   macos:
+    if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
+    needs: [lint, test]
     runs-on: ${{ matrix.platform.runner }}
     strategy:
       matrix:
@@ -134,11 +216,15 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: 3.12
+      - name: Update Cargo.toml Version
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          echo "Setting version to $VERSION"
+          sed -i '' "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          # args: --release --out dist --find-interpreter -b bin
           args: --release --out dist --find-interpreter
           sccache: 'true'
       - name: Upload wheels
@@ -147,51 +233,21 @@ jobs:
           name: wheels-macos-${{ matrix.platform.target }}
           path: dist
 
-  # emscripten:
-  #   runs-on: ${{ matrix.platform.runner }}
-  #   strategy:
-  #     matrix:
-  #       platform:
-  #         - runner: ubuntu-latest
-  #           target: wasm32-unknown-emscripten
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - uses: actions/setup-python@v5
-  #       with:
-  #         python-version: 3.12
-  #     - run: pip install pyodide-build
-  #     - name: Get Emscripten and Python version info
-  #       shell: bash
-  #       run: |
-  #         echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV
-  #         echo PYTHON_VERSION=$(pyodide config get python_version | cut -d '.' -f 1-2) >> $GITHUB_ENV
-  #         pip uninstall -y pyodide-build
-  #     - uses: mymindstorm/setup-emsdk@v12
-  #       with:
-  #         version: ${{ env.EMSCRIPTEN_VERSION }}
-  #         actions-cache-folder: emsdk-cache
-  #     - uses: actions/setup-python@v5
-  #       with:
-  #         python-version: ${{ env.PYTHON_VERSION }}
-  #     - run: pip install pyodide-build
-  #     - name: Build wheels
-  #       uses: PyO3/maturin-action@v1
-  #       with:
-  #         target: ${{ matrix.platform.target }}
-  #       #  args: --release --out dist -i ${{ env.PYTHON_VERSION }} -b bin
-  #         args: --release --out dist -i ${{ env.PYTHON_VERSION }}
-  #         sccache: 'true'
-  #         rust-toolchain: nightly
-  #     - name: Upload wheels
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         name: wheels-wasm
-  #         path: dist
-
   sdist:
+    if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
+    needs: [lint, test]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+      - name: Update Cargo.toml Version
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/v}
+          echo "Setting version to $VERSION"
+            sed -i "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml              
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
@@ -206,10 +262,8 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    environment: release
     if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
-    # needs: [linux, musllinux, windows, macos, emscripten, sdist]
-    needs: [linux, windows, macos, sdist]
+    needs: [linux, linux-x64, windows, macos, sdist]
     permissions:
       # Use to sign the release artifacts
       id-token: write
@@ -219,12 +273,15 @@ jobs:
       attestations: write
     steps:
       - uses: actions/download-artifact@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
         with:
           subject-path: 'wheels-*/*'
       - name: Publish to PyPI
-        if: "startsWith(github.ref, 'refs/tags/')"
+        if: startsWith(github.ref, 'refs/tags/')
         uses: PyO3/maturin-action@v1
         with:
           command: upload
@@ -238,39 +295,3 @@ jobs:
             wheels-linux-*/*.whl
             wheels-macos-*/*.whl
           prerelease: ${{ contains(github.ref, 'alpha') || contains(github.ref, 'beta') }}
-      # - name: Extract binary and rename
-      #   env:
-      #     PROJECT_NAME: ${{ env.PROJECT_NAME }}
-      #   run: |
-      #     for wheel_dir in wheels-windows-* wheels-linux-* wheels-macos-*; do
-      #       arch=$(echo $wheel_dir | cut -d'-' -f3)
-      #       os=$(echo $wheel_dir | cut -d'-' -f2)
-      #       find ./$wheel_dir -name "*.whl" -exec sh -c '
-      #         wheel_name=$(basename "$1")
-      #         version=$(echo $wheel_name | sed -E "s/.*-([0-9]+\.[0-9]+\.[0-9]+)-.*/\1/")
-      #         unzip -d "$(dirname "$1")" "$1"
-      #         if [ "$2" = "windows" ]; then
-      #           binary_path=$(find "$(dirname "$1")" -name "*.exe")
-      #           if [ -n "$binary_path" ]; then
-      #             mv "$binary_path" "$(dirname "$binary_path")/${PROJECT_NAME}_${version}_${2}_${3}.exe"
-      #           fi
-      #         else
-      #           binary_path=$(find "$(dirname "$1")" -type f -executable)
-      #           if [ -n "$binary_path" ]; then
-      #             mv "$binary_path" "$(dirname "$binary_path")/${PROJECT_NAME}_${version}_${2}_${3}"
-      #           fi
-      #         fi
-      #       ' _ {} "$os" "$arch" \;
-      #     done
-      # - name: Upload to GitHub Release
-      #   uses: softprops/action-gh-release@v2
-      #   with:
-      #     files: |
-      #       wheels-sdist/*.tar.gz
-      #       wheels-windows-*/*.whl
-      #       wheels-windows-*/*.data/scripts/${{ env.PROJECT_NAME }}_*_windows_*.exe
-      #       wheels-linux-*/*.whl
-      #       wheels-linux-*/*.data/scripts/${{ env.PROJECT_NAME }}_*_linux_*
-      #       wheels-macos-*/*.whl
-      #       wheels-macos-*/*.data/scripts/${{ env.PROJECT_NAME }}_*_macos_*
-      #     prerelease: ${{ contains(github.ref, 'alpha') || contains(github.ref, 'beta') }}

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/Cargo.lock

@@ -724,7 +724,7 @@ dependencies = [
 
 [[package]]
 name = "nc-gcode-interpreter"
-version = "0.1.4"
+version = "0.1.7"
 dependencies = [
  "clap",
  "csv",

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/Cargo.toml

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

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nc-gcode-interpreter
-Version: 0.1.4
+Version: 0.1.7
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: 3.12
@@ -9,10 +9,14 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: maturin >=1.7.4
 Requires-Dist: polars >=1.9.0
+Requires-Dist: jupyter >=1.1.1 ; extra == 'dev'
+Requires-Dist: pytest >=8.3.3 ; extra == 'test'
+Provides-Extra: dev
+Provides-Extra: test
 License-File: LICENSE
 Summary: A interpreter for NC (Numerical Control) code
 Author-email: CEAD Group <software@ceadgroup.com>
-Requires-Python: >=3.12
+Requires-Python: >=3.11
 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
@@ -84,7 +88,7 @@ Options:
   -a, --axes <AXIS>                    Override default axis identifiers (comma-separated, e.g., "X,Y,Z")
   -e, --extra-axes <EXTRA_AXIS>        Add extra axis identifiers (comma-separated, e.g., "RA1,RA2")
   -i, --initial_state <INITIAL_STATE>  Optional initial_state file to initialize state
-  -l, --iteration_limit <LIMIT>             Maximum number of iterations for loops [default: 10000]
+  -l, --iteration_limit <LIMIT>        Maximum number of iterations for loops [default: 10000]
   -f, --disable-forward-fill           Disable forward-filling of null values in axes columns
   -h, --help                           Print help
   -V, --version                        Print version

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/README.md

@@ -64,7 +64,7 @@ Options:
   -a, --axes <AXIS>                    Override default axis identifiers (comma-separated, e.g., "X,Y,Z")
   -e, --extra-axes <EXTRA_AXIS>        Add extra axis identifiers (comma-separated, e.g., "RA1,RA2")
   -i, --initial_state <INITIAL_STATE>  Optional initial_state file to initialize state
-  -l, --iteration_limit <LIMIT>             Maximum number of iterations for loops [default: 10000]
+  -l, --iteration_limit <LIMIT>        Maximum number of iterations for loops [default: 10000]
   -f, --disable-forward-fill           Disable forward-filling of null values in axes columns
   -h, --help                           Print help
   -V, --version                        Print version

nc_gcode_interpreter-0.1.7/examples/tool.csv

@@ -0,0 +1,2 @@
+M,T
+M6,BALL_MILL_8MM_SHORT

nc_gcode_interpreter-0.1.7/examples/tool.mpf

@@ -0,0 +1 @@
+T="BALL_MILL_8MM_SHORT" M6

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/ggroups/generate_pest.py

@@ -18,6 +18,10 @@ def create_pest_grammar(g_groups):
     grammar_parts.append(
         "// Due to the way pest works, the sorting of the literals is important."
     )
+    all_words = [
+        f'^"{entry["id"]}"' for group in g_groups for entry in group["entries"]
+    ]
+
     ggroup_names = []
     for group in g_groups:
         group_rules = []
@@ -28,7 +32,15 @@ def create_pest_grammar(g_groups):
         grammar_parts.append(
             f"{ggroup_name} = @{{({' | '.join(reversed(sorted(group_rules)))}) ~ !(ASCII_ALPHANUMERIC) }}"
         )
-    grammar_parts.append(f"g_command = {{{' | '.join(ggroup_names)}}}")
+
+    grammar_parts.append(
+        f"\ngcommand_list = @{{({' | '.join(reversed(sorted(all_words)))}) ~ !(ASCII_ALPHANUMERIC) }}"
+    )
+
+    grammar_parts.append('g_command_numbered = { &("G" ~ ASCII_DIGIT+) ~ g_command }')
+    grammar_parts.append(
+        f"g_command = {{ &gcommand_list ~ ({' | '.join(ggroup_names)})}}"
+    )
     return "\n".join(grammar_parts)
 
 

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/ggroups/ggroups.pest

@@ -60,4 +60,7 @@ gg59_area_limit = @{(^"WALCS9" | ^"WALCS8" | ^"WALCS7" | ^"WALCS6" | ^"WALCS5" |
 gg61_tool_orient_smooth = @{(^"ORISON" | ^"ORISOF") ~ !(ASCII_ALPHANUMERIC) }
 gg62_repos_non_modal = @{(^"RMNBL" | ^"RMIBL" | ^"RMEBL" | ^"RMBBL") ~ !(ASCII_ALPHANUMERIC) }
 gg64_grinding_frames = @{(^"GFRAME[9]" | ^"GFRAME[99]" | ^"GFRAME[98]" | ^"GFRAME[97]" | ^"GFRAME[96]" | ^"GFRAME[95]" | ^"GFRAME[94]" | ^"GFRAME[93]" | ^"GFRAME[92]" | ^"GFRAME[91]" | ^"GFRAME[90]" | ^"GFRAME[8]" | ^"GFRAME[89]" | ^"GFRAME[88]" | ^"GFRAME[87]" | ^"GFRAME[86]" | ^"GFRAME[85]" | ^"GFRAME[84]" | ^"GFRAME[83]" | ^"GFRAME[82]" | ^"GFRAME[81]" | ^"GFRAME[80]" | ^"GFRAME[7]" | ^"GFRAME[79]" | ^"GFRAME[78]" | ^"GFRAME[77]" | ^"GFRAME[76]" | ^"GFRAME[75]" | ^"GFRAME[74]" | ^"GFRAME[73]" | ^"GFRAME[72]" | ^"GFRAME[71]" | ^"GFRAME[70]" | ^"GFRAME[6]" | ^"GFRAME[69]" | ^"GFRAME[68]" | ^"GFRAME[67]" | ^"GFRAME[66]" | ^"GFRAME[65]" | ^"GFRAME[64]" | ^"GFRAME[63]" | ^"GFRAME[62]" | ^"GFRAME[61]" | ^"GFRAME[60]" | ^"GFRAME[5]" | ^"GFRAME[59]" | ^"GFRAME[58]" | ^"GFRAME[57]" | ^"GFRAME[56]" | ^"GFRAME[55]" | ^"GFRAME[54]" | ^"GFRAME[53]" | ^"GFRAME[52]" | ^"GFRAME[51]" | ^"GFRAME[50]" | ^"GFRAME[4]" | ^"GFRAME[49]" | ^"GFRAME[48]" | ^"GFRAME[47]" | ^"GFRAME[46]" | ^"GFRAME[45]" | ^"GFRAME[44]" | ^"GFRAME[43]" | ^"GFRAME[42]" | ^"GFRAME[41]" | ^"GFRAME[40]" | ^"GFRAME[3]" | ^"GFRAME[39]" | ^"GFRAME[38]" | ^"GFRAME[37]" | ^"GFRAME[36]" | ^"GFRAME[35]" | ^"GFRAME[34]" | ^"GFRAME[33]" | ^"GFRAME[32]" | ^"GFRAME[31]" | ^"GFRAME[30]" | ^"GFRAME[2]" | ^"GFRAME[29]" | ^"GFRAME[28]" | ^"GFRAME[27]" | ^"GFRAME[26]" | ^"GFRAME[25]" | ^"GFRAME[24]" | ^"GFRAME[23]" | ^"GFRAME[22]" | ^"GFRAME[21]" | ^"GFRAME[20]" | ^"GFRAME[1]" | ^"GFRAME[19]" | ^"GFRAME[18]" | ^"GFRAME[17]" | ^"GFRAME[16]" | ^"GFRAME[15]" | ^"GFRAME[14]" | ^"GFRAME[13]" | ^"GFRAME[12]" | ^"GFRAME[11]" | ^"GFRAME[10]" | ^"GFRAME[100]" | ^"GFRAME[0]") ~ !(ASCII_ALPHANUMERIC) }
-g_command = {gg01_motion | gg02_wait | gg03_frame_area_limit | gg04_fifo | gg06_plane_select | gg07_tool_radius | gg08_work_offset | gg09_frame_tool_suppress | gg10_exact_stop_mode | gg11_exact_stop_non_modal | gg12_block_change_g60_g9 | gg13_wp_measure | gg14_wp_measure_mode | gg15_feed_type | gg16_feedrate_override | gg17_approach_retract_tool | gg18_corner_behavior | gg19_curve_start_spline | gg20_curve_end_spline | gg21_accel_profile | gg22_tool_offset_type | gg23_collision_monitor | gg24_precontrol | gg25_tool_orient_ref | gg26_repos_mode | gg27_tool_offset_change | gg28_area_limit | gg29_rad_diam_prog | gg30_nc_compress | gg31_oem_g | gg32_oem_g | gg33_fine_tool_offset | gg34_tool_orient_smooth | gg35_punch_nibble | gg36_punch_delay | gg37_feedrate_profile | gg39_contour_acc | gg40_tool_radius_const | gg41_thread_interrupt | gg42_tool_carrier | gg43_sar_approach | gg44_sar_segment | gg45_path_ref_fgroup | gg46_plane_fast_retract | gg47_mode_switchover | gg48_approach_retract_trc | gg49_ptp_motion | gg50_orient_prog | gg51_interp_type_orient | gg52_frame_rot_wp | gg53_tool_wear | gg54_vector_rot_poly | gg55_rapid_traverse | gg56_frame_rot_tool | gg57_corner_decel | gg58_dyn_resp_path | gg59_area_limit | gg61_tool_orient_smooth | gg62_repos_non_modal | gg64_grinding_frames}
+
+gcommand_list = @{(^"WALIMON" | ^"WALIMOF" | ^"WALCS9" | ^"WALCS8" | ^"WALCS7" | ^"WALCS6" | ^"WALCS5" | ^"WALCS4" | ^"WALCS3" | ^"WALCS2" | ^"WALCS10" | ^"WALCS1" | ^"WALCS0" | ^"UPATH" | ^"TRANS" | ^"TOWWCS" | ^"TOWTCS" | ^"TOWSTD" | ^"TOWMCS" | ^"TOWKCS" | ^"TOWBCS" | ^"TOROTZ" | ^"TOROTY" | ^"TOROTX" | ^"TOROTOF" | ^"TOROT" | ^"TOFRAMEZ" | ^"TOFRAMEY" | ^"TOFRAMEX" | ^"TOFRAME" | ^"TCOFRZ" | ^"TCOFRY" | ^"TCOFRX" | ^"TCOFR" | ^"TCOABS" | ^"SUPD" | ^"SUPA" | ^"STOPFIFO" | ^"STARTFIFO" | ^"SPOF" | ^"SPATH" | ^"SONS" | ^"SON" | ^"SOFT" | ^"SCALE" | ^"RTLION" | ^"RTLIOF" | ^"ROTS" | ^"ROT" | ^"RMNBL" | ^"RMN" | ^"RMIBL" | ^"RMI" | ^"RMEBL" | ^"RME" | ^"RMBBL" | ^"RMB" | ^"REPOSQA" | ^"REPOSQ" | ^"REPOSL" | ^"REPOSHA" | ^"REPOSH" | ^"REPOSA" | ^"PTPWOC" | ^"PTPG0" | ^"PTP" | ^"PONS" | ^"PON" | ^"POLY" | ^"PDELAYON" | ^"PDELAYOF" | ^"PAROTOF" | ^"PAROT" | ^"OST" | ^"OSSE" | ^"OSS" | ^"OSOF" | ^"OSD" | ^"OSC" | ^"ORIWKS" | ^"ORIVIRT2" | ^"ORIVIRT1" | ^"ORIVECT" | ^"ORISON" | ^"ORISOF" | ^"ORIRPY2" | ^"ORIRPY" | ^"ORIROTT" | ^"ORIROTR" | ^"ORIROTC" | ^"ORIROTA" | ^"ORIPLANE" | ^"ORIPATHS" | ^"ORIPATH" | ^"ORIMKS" | ^"ORIEULER" | ^"ORID" | ^"ORICURVE" | ^"ORICONTO" | ^"ORICONIO" | ^"ORICONCW" | ^"ORICONCCW" | ^"ORIC" | ^"ORIAXPOS" | ^"ORIAXES" | ^"OEMIPO2" | ^"OEMIPO1" | ^"NORM" | ^"MIRROR" | ^"LFWP" | ^"LFTXT" | ^"LFPOS" | ^"LFON" | ^"LFOF" | ^"KONTT" | ^"KONTC" | ^"KONT" | ^"INVCW" | ^"INVCCW" | ^"GFRAME[9]" | ^"GFRAME[99]" | ^"GFRAME[98]" | ^"GFRAME[97]" | ^"GFRAME[96]" | ^"GFRAME[95]" | ^"GFRAME[94]" | ^"GFRAME[93]" | ^"GFRAME[92]" | ^"GFRAME[91]" | ^"GFRAME[90]" | ^"GFRAME[8]" | ^"GFRAME[89]" | ^"GFRAME[88]" | ^"GFRAME[87]" | ^"GFRAME[86]" | ^"GFRAME[85]" | ^"GFRAME[84]" | ^"GFRAME[83]" | ^"GFRAME[82]" | ^"GFRAME[81]" | ^"GFRAME[80]" | ^"GFRAME[7]" | ^"GFRAME[79]" | ^"GFRAME[78]" | ^"GFRAME[77]" | ^"GFRAME[76]" | ^"GFRAME[75]" | ^"GFRAME[74]" | ^"GFRAME[73]" | ^"GFRAME[72]" | ^"GFRAME[71]" | ^"GFRAME[70]" | ^"GFRAME[6]" | ^"GFRAME[69]" | ^"GFRAME[68]" | ^"GFRAME[67]" | ^"GFRAME[66]" | ^"GFRAME[65]" | ^"GFRAME[64]" | ^"GFRAME[63]" | ^"GFRAME[62]" | ^"GFRAME[61]" | ^"GFRAME[60]" | ^"GFRAME[5]" | ^"GFRAME[59]" | ^"GFRAME[58]" | ^"GFRAME[57]" | ^"GFRAME[56]" | ^"GFRAME[55]" | ^"GFRAME[54]" | ^"GFRAME[53]" | ^"GFRAME[52]" | ^"GFRAME[51]" | ^"GFRAME[50]" | ^"GFRAME[4]" | ^"GFRAME[49]" | ^"GFRAME[48]" | ^"GFRAME[47]" | ^"GFRAME[46]" | ^"GFRAME[45]" | ^"GFRAME[44]" | ^"GFRAME[43]" | ^"GFRAME[42]" | ^"GFRAME[41]" | ^"GFRAME[40]" | ^"GFRAME[3]" | ^"GFRAME[39]" | ^"GFRAME[38]" | ^"GFRAME[37]" | ^"GFRAME[36]" | ^"GFRAME[35]" | ^"GFRAME[34]" | ^"GFRAME[33]" | ^"GFRAME[32]" | ^"GFRAME[31]" | ^"GFRAME[30]" | ^"GFRAME[2]" | ^"GFRAME[29]" | ^"GFRAME[28]" | ^"GFRAME[27]" | ^"GFRAME[26]" | ^"GFRAME[25]" | ^"GFRAME[24]" | ^"GFRAME[23]" | ^"GFRAME[22]" | ^"GFRAME[21]" | ^"GFRAME[20]" | ^"GFRAME[1]" | ^"GFRAME[19]" | ^"GFRAME[18]" | ^"GFRAME[17]" | ^"GFRAME[16]" | ^"GFRAME[15]" | ^"GFRAME[14]" | ^"GFRAME[13]" | ^"GFRAME[12]" | ^"GFRAME[11]" | ^"GFRAME[10]" | ^"GFRAME[100]" | ^"GFRAME[0]" | ^"G973" | ^"G972" | ^"G971" | ^"G97" | ^"G962" | ^"G961" | ^"G96" | ^"G952" | ^"G95" | ^"G942" | ^"G94" | ^"G931" | ^"G93" | ^"G91" | ^"G90" | ^"G9" | ^"G829" | ^"G828" | ^"G827" | ^"G826" | ^"G825" | ^"G824" | ^"G823" | ^"G822" | ^"G821" | ^"G820" | ^"G819" | ^"G818" | ^"G817" | ^"G816" | ^"G815" | ^"G814" | ^"G813" | ^"G812" | ^"G811" | ^"G810" | ^"G75" | ^"G74" | ^"G710" | ^"G71" | ^"G700" | ^"G70" | ^"G7" | ^"G645" | ^"G644" | ^"G643" | ^"G642" | ^"G641" | ^"G64" | ^"G63" | ^"G621" | ^"G62" | ^"G603" | ^"G602" | ^"G601" | ^"G60" | ^"G599" | ^"G598" | ^"G597" | ^"G596" | ^"G595" | ^"G594" | ^"G593" | ^"G592" | ^"G591" | ^"G590" | ^"G59" | ^"G589" | ^"G588" | ^"G587" | ^"G586" | ^"G585" | ^"G584" | ^"G583" | ^"G582" | ^"G581" | ^"G580" | ^"G58" | ^"G579" | ^"G578" | ^"G577" | ^"G576" | ^"G575" | ^"G574" | ^"G573" | ^"G572" | ^"G571" | ^"G570" | ^"G57" | ^"G569" | ^"G568" | ^"G567" | ^"G566" | ^"G565" | ^"G564" | ^"G563" | ^"G562" | ^"G561" | ^"G560" | ^"G56" | ^"G559" | ^"G558" | ^"G557" | ^"G556" | ^"G555" | ^"G554" | ^"G553" | ^"G552" | ^"G551" | ^"G550" | ^"G55" | ^"G549" | ^"G548" | ^"G547" | ^"G546" | ^"G545" | ^"G544" | ^"G543" | ^"G542" | ^"G541" | ^"G540" | ^"G54" | ^"G539" | ^"G538" | ^"G537" | ^"G536" | ^"G535" | ^"G534" | ^"G533" | ^"G532" | ^"G531" | ^"G530" | ^"G53" | ^"G529" | ^"G528" | ^"G527" | ^"G526" | ^"G525" | ^"G524" | ^"G523" | ^"G522" | ^"G521" | ^"G520" | ^"G519" | ^"G518" | ^"G517" | ^"G516" | ^"G515" | ^"G514" | ^"G513" | ^"G512" | ^"G511" | ^"G510" | ^"G509" | ^"G508" | ^"G507" | ^"G506" | ^"G505" | ^"G500" | ^"G5" | ^"G462" | ^"G461" | ^"G460" | ^"G451" | ^"G450" | ^"G42" | ^"G41" | ^"G40" | ^"G4" | ^"G35" | ^"G348" | ^"G347" | ^"G341" | ^"G340" | ^"G34" | ^"G336" | ^"G335" | ^"G332" | ^"G331" | ^"G33" | ^"G3" | ^"G291" | ^"G290" | ^"G26" | ^"G25" | ^"G248" | ^"G247" | ^"G2" | ^"G19" | ^"G18" | ^"G17" | ^"G153" | ^"G148" | ^"G147" | ^"G143" | ^"G142" | ^"G141" | ^"G140" | ^"G112" | ^"G111" | ^"G110" | ^"G1" | ^"G0" | ^"FTOCON" | ^"FTOCOF" | ^"FNORM" | ^"FLIN" | ^"FIFOCTRL" | ^"FFWON" | ^"FFWOF" | ^"FENDNORM" | ^"FCUB" | ^"ETAN" | ^"ENAT" | ^"EAUTO" | ^"DYNSEMIFIN" | ^"DYNROUGH" | ^"DYNPREC" | ^"DYNPOS" | ^"DYNNORM" | ^"DYNFINISH" | ^"DRIVE" | ^"DIAMON" | ^"DIAMOF" | ^"DIAMCYCOF" | ^"DIAM90" | ^"CUTCONON" | ^"CUTCONOF" | ^"CUT3DFS" | ^"CUT3DFF" | ^"CUT3DFD" | ^"CUT3DF" | ^"CUT3DCD" | ^"CUT3DCCD" | ^"CUT3DCC" | ^"CUT3DC" | ^"CUT2DFD" | ^"CUT2DF" | ^"CUT2DD" | ^"CUT2D" | ^"CT" | ^"CSPLINE" | ^"CPRECON" | ^"CPRECOF" | ^"CP" | ^"COMPSURF" | ^"COMPON" | ^"COMPOF" | ^"COMPCURV" | ^"COMPCAD" | ^"CIP" | ^"CFTCP" | ^"CFIN" | ^"CFC" | ^"CDON" | ^"CDOF2" | ^"CDOF" | ^"BTAN" | ^"BSPLINE" | ^"BRISK" | ^"BNAT" | ^"BAUTO" | ^"ATRANS" | ^"ASPLINE" | ^"ASCALE" | ^"AROTS" | ^"AROT" | ^"AMIRROR") ~ !(ASCII_ALPHANUMERIC) }
+g_command_numbered = { &("G" ~ ASCII_DIGIT+) ~ g_command }
+g_command = { &gcommand_list ~ (gg01_motion | gg02_wait | gg03_frame_area_limit | gg04_fifo | gg06_plane_select | gg07_tool_radius | gg08_work_offset | gg09_frame_tool_suppress | gg10_exact_stop_mode | gg11_exact_stop_non_modal | gg12_block_change_g60_g9 | gg13_wp_measure | gg14_wp_measure_mode | gg15_feed_type | gg16_feedrate_override | gg17_approach_retract_tool | gg18_corner_behavior | gg19_curve_start_spline | gg20_curve_end_spline | gg21_accel_profile | gg22_tool_offset_type | gg23_collision_monitor | gg24_precontrol | gg25_tool_orient_ref | gg26_repos_mode | gg27_tool_offset_change | gg28_area_limit | gg29_rad_diam_prog | gg30_nc_compress | gg31_oem_g | gg32_oem_g | gg33_fine_tool_offset | gg34_tool_orient_smooth | gg35_punch_nibble | gg36_punch_delay | gg37_feedrate_profile | gg39_contour_acc | gg40_tool_radius_const | gg41_thread_interrupt | gg42_tool_carrier | gg43_sar_approach | gg44_sar_segment | gg45_path_ref_fgroup | gg46_plane_fast_retract | gg47_mode_switchover | gg48_approach_retract_trc | gg49_ptp_motion | gg50_orient_prog | gg51_interp_type_orient | gg52_frame_rot_wp | gg53_tool_wear | gg54_vector_rot_poly | gg55_rapid_traverse | gg56_frame_rot_tool | gg57_corner_decel | gg58_dyn_resp_path | gg59_area_limit | gg61_tool_orient_smooth | gg62_repos_non_modal | gg64_grinding_frames)}

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "maturin"
 
 [project]
 name = "nc-gcode-interpreter"
-version = "0.1.4"
+dynamic = ["version"]
 description = "A interpreter for NC (Numerical Control) code"
 authors = [{ name = "CEAD Group", email = "software@ceadgroup.com" }]
-requires-python = ">=3.12"
+requires-python = ">=3.11"
 classifiers = [
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",
@@ -21,6 +21,14 @@ dependencies = [
     "polars>=1.9.0"
 ]
 
+[project.optional-dependencies]
+dev = [
+    "jupyter>=1.1.1"
+]
+test = [
+    "pytest>=8.3.3"
+]
+
 [project.urls]
 Homepage = "https://github.com/CEAD-group/nc-gcode-interpreter"
 Repository = "https://github.com/CEAD-group/nc-gcode-interpreter.git"

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.7}/python/tests/test_expected_output.py

@@ -1,7 +1,6 @@
 import pathlib
 import pytest
 from nc_gcode_interpreter import nc_to_dataframe
-from polars import DataFrame
 
 
 @pytest.fixture(
@@ -33,7 +32,7 @@ def test_mpf_file_to_csv(mpf_file, initial_state):
     """
     Test the nc_to_dataframe function with each .mpf file, using the default initial state.
     """
-    df: DataFrame = nc_to_dataframe(
+    nc_to_dataframe(
         mpf_file.read_text(),
         initial_state=initial_state,
         iteration_limit=10000,