Merge pull request #102 from Wakoma/for-cadorchestrator-v0.1.0

Updating for breaking changes in CadOrchechestrator v0.1.0, tweak requirements

.github/workflows/publish.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Generate example docs
         uses: coactions/setup-xvfb@v1
         with:
-          run: cadorchestrator --headless generate "[\"NUC10i5FNH\", \"Raspberry_Pi_4B\", \"Raspberry_Pi_4B\"]"
+          run: 'cadorchestrator --headless generate "{\"device-ids\": [\"NUC10i5FNH\", \"Raspberry_Pi_4B\", \"Raspberry_Pi_4B\"]}"'
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1

nimble_build_system/orchestration/configuration.py

@@ -17,7 +17,8 @@
 from nimble_build_system.cad.shelf import create_shelf_for
 from nimble_build_system.orchestration.paths import REL_MECH_DIR
 
-def create_assembly(selected_device_ids):
+def create_assembly(config_dict):
+    selected_device_ids = config_dict['device-ids']
     config = NimbleConfiguration(selected_device_ids)
     return config.main_assembly
 

nimble_build_system/utils/gen_nimble_conf_options.py

@@ -54,7 +54,9 @@ def main():
 
     conf_dict = {
         "options": [{
+            "response-key": "device-ids",
             "option-type": "list",
+            "item-name": "Shelf",
             "add-options": [
                 {
                     "display-name": "Access Point",

setup.py

@@ -11,16 +11,14 @@
     python_requires='>=3.10',
     install_requires=[
         'numpy~=1.26',
-        # 'cadquery>=2',
-        'cadquery @ git+https://github.com/CadQuery/cadquery.git',
-        'cadquery-png-plugin @ git+https://github.com/jmwright/cadquery-png-plugin.git',
+        'cadquery==2.4.0',
+        'cadquery_png_plugin',
         'cadscript>=0.5.2',
         'exsource-tools',
-        'cq-cli @ git+https://github.com/CadQuery/cq-cli.git',
-        'gitbuilding==0.15.0a4',
-        'cq-annotate @ git+https://github.com/jmwright/cq-annotate.git',
+        'cadquery-cli==2.3.0',
+        'cq_annotate',
         'cq_warehouse @ git+https://github.com/gumyr/cq_warehouse.git',
-        'cadorchestrator>=0.0.3'
+        'cadorchestrator>=0.1.0'
     ],
     extras_require={
         'dev': [