Fix python dependencies and GitHub actions YAML

Wakoma · Dec 13, 2024 · 71ba064 · 71ba064
1 parent 4babecc
commit 71ba064
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Generate example docs
         uses: coactions/setup-xvfb@v1
         with:
-          run: cadorchestrator --headless generate "{'device-ids': [\"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

diff --git a/setup.py b/setup.py
@@ -10,8 +10,10 @@
     version = '0.0.1',
     python_requires='>=3.10',
     install_requires=[
+        #defined to stop us using numpy 2 that CQ-cli isn't compatible with
         'numpy~=1.26',
-        # 'cadquery>=2',
+        #Stop whatever requires nlopt pulling in 2.8 which requires numpy v2.0.0
+        'nlopt<2.8.0',
         'cadquery @ git+https://github.com/CadQuery/cadquery.git',
         'cadquery-png-plugin @ git+https://github.com/jmwright/cadquery-png-plugin.git',
         'cadscript>=0.5.2',