Support Extensions Platform

.github/workflows/test-addon.yml

@@ -2,9 +2,9 @@ name: Test in Blender
 
 on: 
     push:
-      branches: ["main"]
+      branches: ["main", "4.2", "extensions-platform"]
     pull_request:
-      branches: ["main", "4.1"]
+      branches: ["main", "4.2", "extensions-platform"]
 
 jobs:
     build:
@@ -13,57 +13,44 @@ jobs:
             max-parallel: 4
             fail-fast: false
             matrix:
-              blender-version: ["4.1"]
-              os: [ubuntu-latest, windows-latest, macos-13, macos-14]
-              # os: [macos-13]
+              blender-version: ["4.2"]
+              os: [ubuntu-latest, macos-14]
         steps:
             - uses: actions/checkout@v4
             - uses: actions/setup-python@v5
               with:
                 python-version: 3.11.7
 
-            - name: Test in Blender MacOS Intel
-              if: matrix.os == 'macos-13'
-              run: |
-                curl -L -o blender.dmg https://download.blender.org/release/Blender4.1/blender-4.1.0-macos-x64.dmg
-                hdiutil attach blender.dmg
-                cp -R /Volumes/Blender/Blender.app /Applications/
-                hdiutil detach /Volumes/Blender
-                /Applications/Blender.app/Contents/MacOS/Blender --version
-                /Applications/Blender.app/Contents/MacOS/Blender -b --python tests/install.py
-                /Applications/Blender.app/Contents/MacOS/Blender -b --python tests/run.py -- -v 
+            - name: Cache Blender
+              uses: actions/cache@v2
+              with:
+                path: ~/blender.tar.xz
+                key: ${{ runner.os }}-blender-${{ hashFiles('**/test-addon.yml') }}
 
             - name: Test in Blender MacOS ARM
               if: matrix.os == 'macos-14'
               run: |
-                curl -L -o blender.dmg https://download.blender.org/release/Blender4.1/blender-4.1.0-macos-arm64.dmg
+                curl -L -o blender.dmg https://cdn.builder.blender.org/download/daily/blender-4.2.0-beta+v42.6f724b83c663-darwin.arm64-release.dmg
                 hdiutil attach blender.dmg
                 cp -R /Volumes/Blender/Blender.app /Applications/
                 hdiutil detach /Volumes/Blender
                 /Applications/Blender.app/Contents/MacOS/Blender --version
                 /Applications/Blender.app/Contents/MacOS/Blender -b --python tests/install.py
-                /Applications/Blender.app/Contents/MacOS/Blender -b --python tests/run.py -- -v 
-
-            - name: Test in Blender Windows
-              if: matrix.os == 'windows-latest'
-              shell: pwsh
-              run: |
-                Invoke-WebRequest -Uri "https://download.blender.org/release/Blender4.1/blender-4.1.0-windows-x64.zip" -OutFile "blender.zip"
-                Expand-Archive -Path "blender.zip" -DestinationPath "blender"
-                .\blender\blender-4.1.0-windows-x64\blender.exe --version
-                .\blender\blender-4.1.0-windows-x64\blender.exe -b --python tests/install.py
-                .\blender\blender-4.1.0-windows-x64\blender.exe -b --python tests/run.py -- -v tests/
-
+                /Applications/Blender.app/Contents/MacOS/Blender -b --python tests/run.py -- -v tests/
+
             - name: Test in Blender Linux
               if: matrix.os == 'ubuntu-latest'
               run: |
-                wget -nv https://download.blender.org/release/Blender4.1/blender-4.1.0-linux-x64.tar.xz
-                tar -xf blender-4.1.0-linux-x64.tar.xz
-
-                blender-4.1.0-linux-x64/blender --version
-                blender-4.1.0-linux-x64/blender -b --python tests/install.py
-                blender-4.1.0-linux-x64/blender -b --python tests/run.py -- -v tests/ --cov=molecularnodes --cov-report=xml:coverage.xml --ignore=molecularnodes/ui/panel.py
-
+                if [[ ! -f ./blender.tar.xz ]]; then
+                  wget -nv https://cdn.builder.blender.org/download/daily/blender-4.2.0-beta+v42.6f724b83c663-linux.x86_64-release.tar.xz -O ./blender.tar.xz
+                fi
+                mkdir -p ./blender
+                ls -lrta
+                tar -xf ./blender.tar.xz -C ./blender --strip-components=1
+                ls -lrta
+                blender/blender --version
+                blender/blender -b --python tests/install.py
+                blender/blender -b --python tests/run.py -- -v tests/ --cov=molecularnodes --cov-report=xml:coverage.xml --ignore=molecularnodes/ui/panel.py            
             - name: Expose coverage as a CI download 
               uses: actions/upload-artifact@v1
               if: matrix.os == 'ubuntu-latest'

.gitignore

@@ -6,7 +6,7 @@
 *.blend1
 __pycache__/*
 .vscode/*
-molecularnodes_*.zip
+molecularnodes*.zip
 *.pyc
 .Rproj.user
 /.quarto/
@@ -27,5 +27,4 @@ poetry.lock
 *.vdb
 docs/nodes/*.qmd
 !docs/nodes/index.qmd
-
-
+*.whl

build.py

@@ -1,24 +1,155 @@
+import glob
 import os
+import shutil
+import subprocess
+import sys
 import zipfile
+from dataclasses import dataclass
+from typing import List, Union
 
+import tomlkit
 
-# zips up the template file
-def zip_template():
-    # Define the directory and zip file paths
-    dir_path = 'molecularnodes/assets/template/Molecular Nodes'
-    zip_file_path = 'molecularnodes/assets/template/Molecular Nodes.zip'
 
-    # Create a ZipFile object in write mode
-    with zipfile.ZipFile(zip_file_path, 'w', zipfile.ZIP_DEFLATED) as zipf:
-        # Walk the directory tree and add files to the zip file
-        for root, dirs, files in os.walk(dir_path):
+@dataclass
+class Platform:
+    pypi_suffix: str
+    metadata: str
+
+
+# tags for blender metadata
+# platforms = ["windows-x64", "macos-arm64", "linux-x64", "windows-arm64", "macos-x64"]
+
+
+windows_x64 = Platform(pypi_suffix="win_amd64", metadata="windows-x64")
+linux_x64 = Platform(pypi_suffix="manylinux2014_x86_64", metadata="linux-x64")
+macos_arm = Platform(pypi_suffix="macosx_12_0_arm64", metadata="macos-arm64")
+macos_intel = Platform(pypi_suffix="macosx_10_15_x86_64", metadata="macos-x64")
+
+
+required_packages = [
+    "mrcfile==1.4.3",
+    "starfile==0.5.6",
+    "MDAnalysis==2.7.0",
+    "biotite==0.41.0",
+]
+
+
+build_platforms = [
+    windows_x64,
+    linux_x64,
+    macos_arm,
+    macos_intel,
+]
+
+
+def run_python(args: str):
+    python = os.path.realpath(sys.executable)
+    subprocess.run([python] + args.split(" "))
+
+
+def download_whls(
+    python_version="3.11",
+    packages: List[str] = required_packages,
+    platforms: Union[Platform, List[Platform]] = build_platforms,
+):
+    if isinstance(platforms, Platform):
+        platforms = [platforms]
+
+    for platform in platforms:
+        for package in required_packages:
+            run_python(
+                f"-m pip download {package} --dest ./molecularnodes/wheels --only-binary=:all: --python-version={python_version} --platform={platform.pypi_suffix}"
+            )
+
+
+toml_path = "molecularnodes/blender_manifest.toml"
+
+
+def update_toml_whls(platform: Platform):
+    # List all .whl files in the wheels/ subdirectory
+    wheel_files = glob.glob("./wheels/*.whl", root_dir="molecularnodes")
+
+    # scipy and pyarrow both are extremly large packages and aren't actually required by us,
+    # so we can safely remove them (and potentially others) for bundling a smaller wheels/*
+    for whl in wheel_files:
+        if "scipy" in whl or "pyarrow" in whl:
+            os.remove(os.path.join("molecularnodes/", whl.removeprefix("./")))
+            wheel_files.remove(whl)
+
+    # Load the TOML file
+    with open(toml_path, "r") as file:
+        manifest = tomlkit.parse(file.read())
+
+    # Update the wheels list
+    manifest["wheels"] = wheel_files
+    manifest["version"] = "{}-{}".format(manifest["version"], platform.metadata)
+    manifest["platforms"] = platform.metadata
+
+    manifest_str = (
+        tomlkit.dumps(manifest)
+        .replace('["', '[\n\t"')
+        .replace('", "', '",\n\t"')
+        .replace('"]', '",\n]')
+    )
+
+    # Write the updated TOML file
+    with open(toml_path, "w") as file:
+        file.write(manifest_str)
+
+
+def reset_toml() -> None:
+    with open(toml_path, "r") as file:
+        manifest = tomlkit.parse(file.read())
+
+    manifest["version"] = manifest["version"].split("-")[0]
+    manifest["wheels"] = []
+    manifest["platforms"] = []
+
+    with open(toml_path, "w") as file:
+        file.write(tomlkit.dumps(manifest))
+
+
+def zip_extension(platform: Platform) -> None:
+    # Load the TOML file
+    with open(toml_path, "r") as file:
+        manifest = tomlkit.parse(file.read())
+
+    # Get the version number
+    version = manifest["version"].split("-")[0]
+
+    zip_file_name = f"molecularnodes-{version}-{platform.metadata}.zip"
+
+    # Create the zip file
+    with zipfile.ZipFile(zip_file_name, "w", zipfile.ZIP_DEFLATED) as zip_file:
+        # Walk the molecularnodes folder
+        for root, dirs, files in os.walk("molecularnodes"):
+            # Ignore __pycache__ directories
+            if "__pycache__" in root or "blend1" in files:
+                continue
             for file in files:
-                # Get the path of the file
+                # Get the file path
                 file_path = os.path.join(root, file)
+
                 # Add the file to the zip file
-                zipf.write(file_path, arcname=os.path.relpath(
-                    file_path, start='molecularnodes/assets/template/'))
+                zip_file.write(
+                    file_path, arcname=os.path.relpath(file_path, "molecularnodes")
+                )
+
+
+def remove_whls():
+    dir_path = "./molecularnodes/wheels"
+    if os.path.exists(dir_path):
+        shutil.rmtree(dir_path)
+
+
+def build(platform: Platform) -> None:
+    download_whls(platforms=platform)
+    update_toml_whls(platform=platform)
+    zip_extension(platform=platform)
+    remove_whls()
+    reset_toml()
 
 
 if __name__ == "__main__":
-    zip_template()
+    for platform in build_platforms:
+        build(platform)