Tyler/pycleanup

.github/workflows/main.yml

@@ -3,24 +3,16 @@ name: build
 
 on:
   push:
-    branches: [ master ]
     tags:
       - v*
   pull_request:
     branches: [ master ]
 
-# matrix:
-#   maya: [2024]
-#   os: [macos-latest, ubuntu-latest, windows-latest]
-#   include: 
-#     - maya: 2024
-#       update: 2
-
 jobs:
   compile_plugin:
     strategy:
       matrix:
-        maya: [2022, 2023, 2024, 2025]
+        maya: [2022, 2023, 2024, 2025, 2026]
         os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
         include: 
           # Add the maya update versions here
@@ -31,7 +23,9 @@ jobs:
           - maya: 2024
             update: 2
           - maya: 2025
-            update: 1
+            update: 3
+          - maya: 2026
+            update: 2
 
         # cross-compiling is annoying so just fall back to macos-13
         exclude: 
@@ -43,13 +37,18 @@ jobs:
             maya: 2024
           - os: macos-13
             maya: 2025
+          - os: macos-13
+            maya: 2026
 
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - run: git fetch --force --tags origin
+      - name: 'Checkout repo'
+        uses: actions/checkout@v5
+
+      - name: 'ACTUALLY get tags'
+        run: git fetch --force --tag
 
       - name: Get Maya Devkit
         id: get-devkit
@@ -61,6 +60,7 @@ jobs:
       - name: Build Maya
         uses: blurstudio/mayaModuleActions/mesonBuild@v1
         with:
+          meson-version: 1.9.0
           setup-args: >
             -Dmaya:maya_version=${{ matrix.maya }}
             -Dmaya:maya_devkit_base=${{ steps.get-devkit.outputs.devkit-path }}
@@ -88,75 +88,64 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
-      - run: git fetch --force --tags origin
+      - name: 'Checkout repo'
+        uses: actions/checkout@v5
+
+      - name: 'ACTUALLY get tags'
+        run: git fetch --force --tags origin
+
       - name: 'Get Previous tag'
         id: previoustag
         uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
           fallback: v0.0.1
 
+      - name: 'Write version.txt'
+        run: echo "${{ steps.previoustag.outputs.tag }}" > version.txt
+
       - name: Get pyver macos-latest
         if: ${{ matrix.os == 'macos-latest' }}
         shell: bash
         run: |
           echo "PY_VER=3.9" >> $GITHUB_ENV
           echo "PY_VER_FLAT=39" >> $GITHUB_ENV
-          echo "PY_EXT=so" >> $GITHUB_ENV
           echo "PLAT_TAG=macosx_12_0_arm64" >> $GITHUB_ENV
 
       - name: Get pyver ubuntu-latest
         if: ${{ matrix.os == 'ubuntu-latest' }}
         shell: bash
         run: |
-          echo "PY_VER=3.7" >> $GITHUB_ENV
-          echo "PY_VER_FLAT=37" >> $GITHUB_ENV
-          echo "PY_EXT=so" >> $GITHUB_ENV
+          echo "PY_VER=3.9" >> $GITHUB_ENV
+          echo "PY_VER_FLAT=39" >> $GITHUB_ENV
           echo "PLAT_TAG=manylinux_2_17_x86_64" >> $GITHUB_ENV
 
       - name: Get pyver windows-latest
         if: ${{ matrix.os == 'windows-latest' }}
         shell: bash
         run: |
-          echo "PY_VER=3.7" >> $GITHUB_ENV
-          echo "PY_VER_FLAT=37" >> $GITHUB_ENV
-          echo "PY_EXT=pyd" >> $GITHUB_ENV
+          echo "PY_VER=3.9" >> $GITHUB_ENV
+          echo "PY_VER_FLAT=39" >> $GITHUB_ENV
           echo "PLAT_TAG=win_amd64" >> $GITHUB_ENV
 
       - name: Get an older python version 
         uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PY_VER }}
 
-      - name: Build Python
-        uses: blurstudio/mayaModuleActions/mesonBuild@v1
-        with:
-          setup-args: >
-            -Dmaya_build=false
-            -Dpython_build=true
-            --buildtype release
-            --backend ninja
-          install-args: --skip-subprojects
+      - name: Install pip packages
+        shell: bash
+        run: |
+          python -m pip install -U build wheel
 
       - name: Build Wheel
         shell: bash
         run: |
-          python -m pip install -U pip
-          python -m pip install -U build wheel hatch
-          python -m hatch version ${{ steps.previoustag.outputs.tag }}
           python -m build --wheel
           for PY_WHEEL in dist/*.whl
           do
           python -m wheel tags --remove --python-tag ${{ env.PY_VER_FLAT }} --abi-tag abi3 --platform-tag ${{ env.PLAT_TAG }} ${PY_WHEEL}
           done
 
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ runner.os }}-pyModule
-          path: output_Python/*.${{ env.PY_EXT }}
-          if-no-files-found: error
-
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -169,14 +158,28 @@ jobs:
     needs: [compile_plugin, compile_python]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - run: git fetch --force --tags origin
-      - name: 'Get Previous tag'
+      - name: Checkout repo
+        uses: actions/checkout@v5
+
+      - name: 'ACTUALLY get tags'
+        run: git fetch --force --tags origin
+
+      - name: Get Previous tag
         id: previoustag
         uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
           fallback: v0.0.1
 
+      - name: Build the module scripts folder
+        uses: blurstudio/mayaModuleActions/mesonBuild@v1
+        with:
+          meson-version: 1.9.0
+          setup-args: >
+            -Dmaya_build=false
+            -Dpython_build=true
+            -Dpython_script_build=true
+          install-args: --skip-subprojects
+
       - name: Package
         uses: blurstudio/mayaModuleActions/packageMayaModule@v1
         with: 

.gitignore

@@ -5,6 +5,13 @@ ehthumbs.db
 # Release zipfile
 Simplex.zip
 
+# Auto-generated version files
+version.txt
+_version.py
+
+# clang compile commands
+compile_commands.json
+
 # Build folders
 Maya20*/
 **/build/
@@ -38,6 +45,17 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
+# clang LSP
+.cache
+
+# Known subprojects
+**/Eigen-*/
+**/rapidjson-*/
+subprojects/packagecache/
+
+# python wheel dist folder
+dist/
+
 # =========================
 # Operating System Files
 # =========================

README.md

@@ -63,4 +63,4 @@ runSimplexUI()
 
 
 ## Compiling
-Hopefully you don't need to do this, but if you have to, just take a look at `.github/workflows/main.yml` and you should be able to piece together how to get a compile working using CMake. You aren't required to download the devkit or set its path for CMake if you've got maya installed on your machine. Also note, I use features from CMake 3.16+ so I can target python 2 and 3 separately.
+Hopefully you don't need to do this, but if you have to, just take a look at the `quick_compile.bat` file to see how to kick off a compile. And also look at `.github/workflows/main.yml` if you need to piece together the dependencies required.

get_version.py

@@ -0,0 +1,38 @@
+import os
+import subprocess
+import sys
+
+VERSION_FILE = "version.txt"
+
+
+def main(srcroot, gitpath):
+    """
+    When building a python wheel, the build system copies the entire source tree into a new folder
+    but it doesn't seem to include git tags, or it doesn't check out the git tags, or *something*
+    So I'm writing out a version.txt file that this function will read and pass along to the
+    meson project() function call
+    """
+    # If version.txt already exists, use it
+    src_file = os.path.join(srcroot, VERSION_FILE)
+    if os.path.exists(src_file):
+        with open(src_file) as f:
+            v = f.read().strip()
+    else:
+        # Otherwise, try git describe
+        try:
+            # fmt: off
+            v = subprocess.check_output(
+                [gitpath, "describe", "--tags", "--always", "--match", "v[0-9]*", "--abbrev=0"],
+                text=True,
+            ).strip()
+            # fmt: on
+        except Exception:
+            v = "0.0.1"  # fallback if not in a git repo
+
+    print(v)
+
+
+if __name__ == "__main__":
+    srcroot = sys.argv[1]
+    gitpath = sys.argv[2]
+    sys.exit(main(srcroot, gitpath))

meson.build

@@ -1,5 +1,19 @@
-project('Simplex', 'cpp', default_options: ['cpp_std=c++20'])
-
+project(
+  'Simplex',
+  'cpp',
+  meson_version : '>=1.7.0',
+  version : configure_file(
+    capture : true,
+    command : [
+      find_program('python', required: true),
+      meson.project_source_root() / 'get_version.py',
+      meson.project_source_root(),
+      find_program('git', native: true, required: true).full_path(),
+    ],
+    output : 'version.txt',
+  ),
+  default_options: ['cpp_std=c++20'],
+)
 
 maya_build = get_option('maya_build')
 python_build = get_option('python_build')
@@ -8,6 +22,9 @@ if not maya_build and not python_build
   error('No builds requested')
 endif
 
+conf_data = configuration_data()
+conf_data.set('VCS_TAG', meson.project_version())
+
 subdir('src/simplexlib')
 if maya_build
   maya_dep = dependency('maya')

meson.options

@@ -1,2 +1,4 @@
 option('maya_build', type : 'boolean', value : true)
 option('python_build', type : 'boolean', value : true)
+option('python_wheel_build', type : 'boolean', value : false)
+option('python_script_build', type : 'boolean', value : false)