convert to extension

Author: timhendriks93

.github/workflows/ci.yml

@@ -6,13 +6,14 @@ jobs:
   build:
     name: "Build"
     runs-on: ubuntu-latest
+    container: linuxserver/blender:latest
     steps:
     - uses: actions/checkout@v4
     - name: Build add-on
       run: |
         cp -R addon servo_animation
         cp README.md LICENSE servo_animation
-        zip -r blender_servo_animation_addon servo_animation
+        blender --command extension build --source-dir addon --output-filepath blender_servo_animation_addon.zip
     - name: Archive add-on ZIP
       uses: actions/upload-artifact@v4
       with:
@@ -40,57 +41,24 @@ jobs:
   test:
     name: "Test"
     needs: build
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        blender:
-        - {version: "4.2.0", dir: "4.2"}
-        - {version: "4.3.0", dir: "4.3"}
-        - {version: "4.3.2", dir: "4.3"}
+        version:
+        - "4.2.0"
+        - "4.3.0"
+        - "4.3.2"
+    runs-on: ubuntu-latest
+    container: linuxserver/blender:${{ matrix.version }}
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.10"
-        cache: "pip"
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install --no-install-recommends -y unzip wget xz-utils libxi6 libxxf86vm1 libxfixes3 libxrender1 libgl1
-    - name: Restore Blender cache
-      id: restore-blender-cache
-      uses: actions/cache/restore@v4
-      with:
-        path: blender-${{ matrix.blender.version }}
-        key: blender-${{ matrix.blender.version }}
-    - name: Download Blender
-      if: steps.restore-blender-cache.outputs.cache-hit != 'true'
-      run: |
-        python -m pip install --upgrade pip
-        pip install blender-downloader
-        blender-downloader ${{ matrix.blender.version }}
-        mkdir -p blender-${{ matrix.blender.version }}
-        tar xf *.tar.xz -C blender-${{ matrix.blender.version }} --strip-components 1
-    - name: Cache Blender
-      uses: actions/cache/save@v4
-      if: steps.restore-blender-cache.outputs.cache-hit != 'true'
-      with:
-        path: blender-${{ matrix.blender.version }}
-        key: blender-${{ matrix.blender.version }}
-    - name: Create Blender symlink
-      run: |
-        sudo ln -s "$(pwd)/blender-${{ matrix.blender.version }}/blender" /usr/bin/blender
     - name: Download add-on
       uses: actions/download-artifact@v4
       with:
         name: blender_servo_animation_addon.zip
-    - name: Install add-on
+    - name: Install add-on and dependencies
       run: |
-        unzip blender_servo_animation_addon.zip
-        sudo ln -s "$(pwd)/servo_animation" "$(pwd)/blender-${{ matrix.blender.version }}/${{ matrix.blender.dir }}/scripts/addons/servo_animation"
+        ./tests/prepare.sh
     - name: Run tests inside Blender
       run: |
-        ./tests/prepare.sh
         ./tests/test.sh

.gitignore

@@ -2,4 +2,5 @@ __pycache__
 .vscode/*
 !.vscode/settings.json
 *.blend1
-tests/results.txt
+tests/results.txt
+*.zip

addon/__init__.py

@@ -8,23 +8,9 @@
 from .ops.arduino_export import ArduinoExport
 from .ops.binary_export import BinaryExport
 from .ops.stop_live_mode import StopLiveMode
-from .ops.install_dependencies import InstallDependencies
 from .ops.start_live_mode import StartLiveMode
 from .ops.calibrate_servo import CalibrateServo
 
-bl_info = {
-    "name": "Export Animation as Servo Position Values",
-    "author": "Tim Hendriks",
-    "version": (1, 4, 0),
-    "blender": (2, 90, 0),
-    "location": "Bone Properties > Servo Settings | File > Import-Export",
-    "description": "Exports armature animations as servo position values.",
-    "warning": "",
-    "doc_url": "https://github.com/timhendriks93/blender-servo-animation#readme",
-    "support": "COMMUNITY",
-    "category": "Import-Export",
-}
-
 
 classes = (
     BonePropertyGroup,
@@ -36,7 +22,6 @@
     BinaryExport,
     StopLiveMode,
     StartLiveMode,
-    InstallDependencies,
     CalibrateServo
 )
 

addon/blender_manifest.toml

@@ -0,0 +1,25 @@
+schema_version = "1.0.0"
+
+id = "servo_animation"
+version = "2.0.0"
+name = "Servo Animation"
+tagline = "Export your Blender animation to servo position values"
+maintainer = "Tim Hendriks <admin@tim-hendriks.com>"
+type = "add-on"
+
+website = "https://github.com/timhendriks93/blender-servo-animation"
+
+tags = ["Animation", "Import-Export", "Rigging"]
+
+blender_version_min = "4.2.0"
+
+license = [
+  "SPDX:GPL-3.0-or-later",
+]
+
+wheels = [
+  "./wheels/pyserial-3.5-py2.py3-none-any.whl",
+  "./wheels/websocket_client-1.5.1-py3-none-any.whl",
+]
+
+files = "Export animation servo position values to disk"

addon/ops/install_dependencies.py

@@ -4,7 +4,6 @@
 
 from bpy.types import Operator
 from ..utils.live_mode import LiveMode
-from ..ops.install_dependencies import InstallDependencies
 
 
 class StartLiveMode(Operator):
@@ -32,8 +31,7 @@ def poll(cls, context):
         servo_animation = context.window_manager.servo_animation
 
         return (
-            InstallDependencies.installed()
-            and not LiveMode.is_connected()
+            not LiveMode.is_connected()
             and (
                 (
                     servo_animation.live_mode_method == LiveMode.METHOD_SERIAL

addon/ops/start_live_mode.py

@@ -3,7 +3,6 @@
 from ..ops.arduino_export import ArduinoExport
 from ..ops.binary_export import BinaryExport
 from ..ops.stop_live_mode import StopLiveMode
-from ..ops.install_dependencies import InstallDependencies
 from ..ops.start_live_mode import StartLiveMode
 from ..utils.live_mode import LiveMode
 
@@ -22,10 +21,7 @@ def draw(self, context):
         col = layout.column()
         col.label(text="Live Mode")
 
-        if InstallDependencies.installed():
-            self.draw_live_mode(context, layout, col)
-        else:
-            self.draw_live_mode_deps(col)
+        self.draw_live_mode(context, layout, col)
 
         col = layout.column(align=True)
         col.label(text="Export")
@@ -63,8 +59,3 @@ def draw_live_mode(cls, context, layout, col):
 
         col = layout.column()
         col.prop(servo_animation, "position_jump_handling")
-
-    @classmethod
-    def draw_live_mode_deps(cls, col):
-        col.label(text="You are missing dependencies", icon="ERROR")
-        col.operator(InstallDependencies.bl_idname, text="Install dependencies")

addon/requirements.txt

@@ -1,4 +1,2 @@
 parameterized
-pyserial
-websocket-client
 websockets

addon/ui/menu_panel.py

@@ -25,6 +25,11 @@ def install_dependencies():
 
     subprocess.run([python, "-m", "pip", "install", "-r", req_file], check=True)
 
+def install_addon():
+    bpy.ops.preferences.addon_install(filepath="blender_servo_animation_addon.zip", overwrite=True)
+    bpy.ops.preferences.addon_enable(module="servo_animation")
+
 if __name__ == "__main__":
     ensure_pip()
+    install_addon()
     install_dependencies()