Update setup.py

.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml

@@ -9,127 +9,135 @@ on:
         required: true
         default: 'dir'
 jobs:
-  # build-linux-x86_64:
+  build-linux-x86_64:
-  #   runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04
-  #   steps:
+    steps:
-  #   - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-  #   - uses: mamba-org/setup-micromamba@v1
+    - uses: mamba-org/setup-micromamba@v1
-  #     with:
+      with:
-  #       environment-name: test
+        environment-name: test
-  #       environment-file: environment.yml
+        environment-file: environment.yml
-  #       init-shell: >-
+        init-shell: >-
-  #           bash
+          bash
-  #   - name: pip install cadquery CQ-editor ... etc
+        # create-args: >-
-  #     shell: bash --login {0}
+    - name: pip install cadquery CQ-editor ... etc
-  #     run: |
+      shell: bash --login {0}
-  #       sudo apt install -y libblas-dev libblas3 libblas64-3 libblas64-dev
+      run: |
-  #       sudo apt install -y libxkbcommon0 libxkbcommon-x11-0 libxcb-xinerama0
+        sudo apt install -y libblas-dev libblas3 libblas64-3 libblas64-dev
-  #       sudo apt install -y qtbase5-dev qt5-qmake
+        sudo apt install -y libxkbcommon0 libxkbcommon-x11-0 libxcb-xinerama0
-  #       micromamba info
+        sudo apt install -y qtbase5-dev qt5-qmake
-  #       pip install pyopengl
+        micromamba info
-  #       pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
+        pip install pyopengl
-  #       pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi
+        pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
-  #       pip install pyinstaller>=5.6
+        pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi typish "multimethod>=1.11,<2.0" "nlopt>=2.9.0,<3.0" typish
-  #       pip install path
+        pip install pyinstaller>=5.6
-  #       pip install jupyter-rfb
+        pip install path
-  #       pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
+        pip install jupyter-rfb
-  #       pip install git+https://github.com/gumyr/bd_warehouse
+        pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
-  #       pip install git+https://github.com/meadiode/cq_gears.git@main
+        pip install git+https://github.com/gumyr/bd_warehouse
-  #       pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
+        pip install git+https://github.com/meadiode/cq_gears.git@main
-  #       pip install git+https://github.com/gumyr/build123d
+        pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-  #       pip install git+https://github.com/JustinSDK/cqMore
+        pip install git+https://github.com/gumyr/build123d
-  #       pip list
+        pip install git+https://github.com/JustinSDK/cqMore
-  #   - name: Run build
+        pip list
-  #     shell: bash --login {0}
+    - name: Run build
-  #     run: |
+      shell: bash --login {0}
-  #       micromamba activate test
+      run: |
-  #       micromamba info
+        micromamba activate test
-  #       pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
+        micromamba info
-  #       cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
+        echo $LD_LIBRARY_PATH
-  #   - uses: actions/upload-artifact@v4
+        export LD_LIBRARY_PATH=/home/runner/micromamba/envs/test/lib
-  #     with:
+        echo $LD_LIBRARY_PATH
-  #       name: CQ-editor-Linux-x86_64
+        pyinstaller --log-level=DEBUG pyinstaller_pip.spec ${{ github.event.inputs.type }}
-  #       path: dist
+        cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
-  # build-macos-x86_64:
+    - uses: actions/upload-artifact@v4
-  #   runs-on: macos-13
+      with:
-  #   steps:
+        name: CQ-editor-Linux-x86_64
-  #   - uses: actions/checkout@v4
+        path: dist
-  #   - uses: mamba-org/setup-micromamba@v1
+  build-macos-x86_64:
-  #     with:
+    runs-on: macos-13
-  #       environment-name: test
+    steps:
-  #       environment-file: environment.yml
+    - uses: actions/checkout@v4
-  #       init-shell: >-
+    - uses: mamba-org/setup-micromamba@v1
-  #           bash
+      with:
-  #   - name: pip install cadquery CQ-editor ... etc
+        environment-name: test
-  #     shell: bash --login {0}
+        environment-file: environment.yml
-  #     run: |
+        init-shell: >-
-  #       micromamba info
+            bash
-  #       pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
+    - name: pip install cadquery CQ-editor ... etc
-  #       pip install --pre git+https://github.com/cadquery/cadquery casadi
+      shell: bash --login {0}
-  #       pip install pyinstaller>=5.6
+      run: |
-  #       pip install path
+        micromamba info
-  #       pip uninstall -y PyQt5
+        pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
-  #       pip install PyQt5==5.15.7
+        pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi typish "multimethod>=1.11,<2.0" "nlopt>=2.9.0,<3.0" typish
-  #       pip install PyQtWebEngine==5.15.6
+        pip install pyinstaller>=5.6
-  #       pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
+        pip install path
-  #       pip install git+https://github.com/gumyr/bd_warehouse
+        pip uninstall -y PyQt5
-  #       pip install git+https://github.com/meadiode/cq_gears.git@main
+        pip install PyQt5==5.15.7
-  #       pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
+        pip install PyQtWebEngine==5.15.6
-  #       pip install git+https://github.com/gumyr/build123d
+        pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
-  #       pip install git+https://github.com/JustinSDK/cqMore
+        pip install git+https://github.com/gumyr/bd_warehouse
-  #       pip list
+        pip install git+https://github.com/meadiode/cq_gears.git@main
-  #   - name: Run build
+        pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-  #     shell: bash --login {0}
+        pip install git+https://github.com/gumyr/build123d
-  #     run: |
+        pip install git+https://github.com/JustinSDK/cqMore
-  #       micromamba activate test
+        pip list
-  #       micromamba info
+    - name: Run build
-  #       pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
+      shell: bash --login {0}
-  #       cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
+      run: |
-  #   - uses: actions/upload-artifact@v4
+        micromamba activate test
-  #     with:
+        micromamba info
-  #       name: CQ-editor-MacOS-x86_64
+        pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
-  #       path: dist
+        cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor-mac.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/CQ-editor.sh
-  # build-macos-arm64:
+    - uses: actions/upload-artifact@v4
-  #   runs-on: macos-14
+      with:
-  #   steps:
+        name: CQ-editor-MacOS-x86_64
-  #   - uses: actions/checkout@v4
+        path: dist
-  #   - uses: mamba-org/setup-micromamba@v1
+  build-macos-arm64:
-  #     with:
+    runs-on: macos-14
-  #       environment-name: test
+    steps:
-  #       environment-file: environment.yml
+    - uses: actions/checkout@v4
-  #       init-shell: >-
+    - uses: mamba-org/setup-micromamba@v1
-  #           bash
+      with:
-  #   - name: pip install cadquery CQ-editor ... etc
+        environment-name: test
-  #     shell: bash --login {0}
+        environment-file: environment.yml
-  #     run: |
+        init-shell: >-
-  #       micromamba info
+            bash
-  #       pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
+    - name: pip install cadquery CQ-editor ... etc
-  #       pip install https://github.com/CadQuery/ocp-build-system/releases/download/7.7.2.0/cadquery_ocp-7.7.2-cp311-cp311-macosx_11_0_arm64.whl
+      shell: bash --login {0}
-  #       pip install https://github.com/jdegenstein/nlopt-python/releases/download/2.7.1.3/nlopt-2.7.1-cp311-cp311-macosx_11_0_arm64.whl
+      run: |
-  #       pip install --pre git+https://github.com/cadquery/cadquery casadi
+        micromamba info
-  #       pip install pyinstaller>=5.6
+        brew update
-  #       pip install path
+        brew upgrade
-  #       pip uninstall -y PyQt5
+        brew install openssl
-  #       pip install PyQt5==5.15.10
+        pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
-  #       pip install PyQtWebEngine==5.15.6
+        pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi typish "multimethod>=1.11,<2.0" "nlopt>=2.9.0,<3.0" typish
-  #       pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
+        pip install pyinstaller>=5.6
-  #       pip install git+https://github.com/gumyr/bd_warehouse
+        pip install path
-  #       pip install git+https://github.com/meadiode/cq_gears.git@main
+        pip uninstall -y PyQt5
-  #       pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
+        pip install PyQt5==5.15.10
-  #       pip install git+https://github.com/gumyr/build123d
+        pip install PyQtWebEngine==5.15.6
-  #       pip install git+https://github.com/JustinSDK/cqMore
+        pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
-  #       pip list
+        pip install git+https://github.com/gumyr/bd_warehouse
-  #   - name: Run build
+        pip install git+https://github.com/meadiode/cq_gears.git@main
-  #     shell: bash --login {0}
+        pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-  #     run: |
+        pip install git+https://github.com/gumyr/build123d
-  #       micromamba activate test
+        pip install git+https://github.com/JustinSDK/cqMore
-  #       micromamba info
+        pip list
-  #       pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
+    - name: Run build
-  #       cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
+      shell: bash --login {0}
-  #   - uses: actions/upload-artifact@v4
+      run: |
-  #     with:
+        micromamba activate test
-  #       name: CQ-editor-MacOS-arm64
+        micromamba info
-  #       path: dist
+        echo $LD_LIBRARY_PATH
+        export LD_LIBRARY_PATH=/home/runner/micromamba/envs/test/lib
+        echo $LD_LIBRARY_PATH
+        pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
+        cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor-mac.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/CQ-editor.sh
+    - uses: actions/upload-artifact@v4
+      with:
+        name: CQ-editor-MacOS-arm64
+        path: dist
   build-windows:
     runs-on: windows-latest
     steps:
@@ -144,9 +152,8 @@ jobs:
       shell: bash --login {0}
       run: |
         micromamba info
-        choco install upx
         pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
-        pip install --pre git+https://github.com/cadquery/cadquery casadi
+        pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi typish "multimethod>=1.11,<2.0" "nlopt>=2.9.0,<3.0" typish
         pip install pyinstaller>=5.6
         pip install path
         pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse

cq_editor/cq_utils.py

@@ -2,7 +2,7 @@ import cadquery as cq
 from cadquery.occ_impl.assembly import toCAF
 
 from typing import List, Union
-from imp import reload
+from importlib import reload
 from types import SimpleNamespace
 
 from OCP.XCAFPrs import XCAFPrs_AISObject
@@ -31,7 +31,7 @@ def find_cq_objects(results: dict):
 
 
 def to_compound(
-    obj: Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.Shape], cq.Sketch]
+    obj: Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.Shape], cq.Sketch],
 ):
 
     vals = []
@@ -213,7 +213,7 @@ def reload_cq():
     reload(cq.sketch)
     reload(cq.occ_impl.exporters.svg)
     reload(cq.cq)
-    reload(cq.occ_impl.exporters.utils)
+    # reload(cq.occ_impl.exporters.utils)
     reload(cq.occ_impl.exporters.dxf)
     reload(cq.occ_impl.exporters.amf)
     reload(cq.occ_impl.exporters.json)

cq_editor/editor.py

@@ -148,7 +148,7 @@ class Editor(CodeEditor,ComponentMixin):
         
         if not self.confirm_discard(): return
 
-        curr_dir = Path(self.filename).abspath().dirname()
+        curr_dir = Path(self.filename).absolute().dirname()
         fname = get_open_filename(self.EXTENSIONS, curr_dir)
         if fname != '':
             self.load_from_file(fname)

cq_editor/widgets/debugger.py

@@ -186,7 +186,7 @@ class Debugger(QObject, ComponentMixin):
     def _exec(self, code, locals_dict, globals_dict):
         with ExitStack() as stack:
             fname = self.parent().components["editor"].filename
-            p = Path(fname if fname else "").abspath().dirname()
+            p = Path(fname if fname else "").absolute().dirname()
 
             if self.preferences["Add script dir to path"] and p.exists():
                 sys.path.insert(0, p)

cq_editor/widgets/editor.py

@@ -147,7 +147,7 @@ class Editor(CodeEditor,ComponentMixin):
         
         if not self.confirm_discard(): return
 
-        curr_dir = Path(self.filename).abspath().dirname()
+        curr_dir = Path(self.filename).absolute().dirname()
         fname = get_open_filename(self.EXTENSIONS, curr_dir)
         if fname != '':
             self.load_from_file(fname)

cqgui_env.yml

@@ -5,7 +5,7 @@ channels:
 dependencies:
   - pyqt=5
   - pyqtgraph
-  - python=3.11
+  - python=3.12
   - spyder=5
   - path
   - logbook

environment.yml

@@ -3,4 +3,4 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python=3.11
+  - python=3.12

pyinstaller/CQ-editor-mac.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+export QT_MAC_WANTS_LAYER=1
+chmod u+x ./CQ-editor/CQ-editor
+QT_QPA_PLATFORM=cocoa PYOPENGL_PLATFORM=x11 ./CQ-editor/CQ-editor

pyinstaller_pip.spec

@@ -10,17 +10,18 @@ spyder_data = Path(site.getsitepackages()[-1]) / 'spyder'
 parso_grammar = (Path(site.getsitepackages()[-1]) / 'parso/python').glob('grammar*')
 cqw_path = Path(site.getsitepackages()[-1]) / 'cq_warehouse'
 bdw_path = Path(site.getsitepackages()[-1]) / 'bd_warehouse'
+b123d_path = Path(site.getsitepackages()[-1]) / 'build123d'
 cq_path = Path(site.getsitepackages()[-1]) / 'cadquery'
 
 if sys.platform == 'linux':
     occt_dir = os.path.join(Path(sys.prefix), 'share', 'opencascade')
-    ocp_path = [(os.path.join(HOMEPATH, 'OCP.cpython-311-x86_64-linux-gnu.so'), '.')]
+    ocp_path = [(os.path.join(HOMEPATH, 'OCP', 'OCP.cpython-312-x86_64-linux-gnu.so'), '.')]
 elif sys.platform == 'darwin':
     occt_dir = os.path.join(Path(sys.prefix), 'share', 'opencascade')
-    ocp_path = [(os.path.join(HOMEPATH, 'OCP.cpython-311-darwin.so'), '.')]
+    ocp_path = [(os.path.join(HOMEPATH, 'OCP', 'OCP.cpython-312-darwin.so'), '.')]
 elif sys.platform == 'win32':
     occt_dir = os.path.join(Path(sys.prefix), 'Library', 'share', 'opencascade')
-    ocp_path = [(os.path.join(HOMEPATH, 'OCP.cp311-win_amd64.pyd'), '.')]
+    ocp_path = [(os.path.join(HOMEPATH, 'OCP', 'OCP.cp312-win_amd64.pyd'), '.')]
 
 datas1, binaries1, hiddenimports1 = collect_all('debugpy')
 hiddenimports2 = collect_submodules('xmlrpc')
@@ -31,6 +32,7 @@ a = Analysis(['run.py'],
              datas=[(spyder_data, 'spyder'),
                     (cqw_path, 'cq_warehouse'),
                     (bdw_path, 'bd_warehouse'),
+                    (b123d_path, 'build123d'),
                     (cq_path, 'cadquery')] +
                     [(p, 'parso/python') for p in parso_grammar] + datas1,
              hiddenimports=['ipykernel.datapub', 'debugpy', 'vtkmodules', 'vtkmodules.all',

setup.py

@@ -3,19 +3,22 @@ import os.path
 
 from setuptools import setup, find_packages
 
+
 def read(rel_path):
     here = os.path.abspath(os.path.dirname(__file__))
-    with codecs.open(os.path.join(here, rel_path), 'r') as fp:
+    with codecs.open(os.path.join(here, rel_path), "r") as fp:
         return fp.read()
 
+
 def get_version(rel_path):
     for line in read(rel_path).splitlines():
-        if line.startswith('__version__'):
+        if line.startswith("__version__"):
             delim = '"' if '"' in line else "'"
             return line.split(delim)[1]
     else:
         raise RuntimeError("Unable to find version string.")
 
+
 setup(
     name="CQ-editor",
     version=get_version("cq_editor/_version.py"),
@@ -26,7 +29,7 @@ setup(
             "CQ-editor = cq_editor.__main__:main",
         ]
     },
-    python_requires=">=3.8,<3.12",
+    python_requires=">=3.10,<3.14",
     install_requires=[
         "logbook>=1",
         "ipython",
@@ -35,5 +38,7 @@ setup(
         "requests>=2,<3",
         "spyder>=5,<6",
         "pyqtgraph",
+        "numpy >= 2, <3",
+        "scipy==1.14.1", # workaround for renamed stuff in scipy optimize
     ],
 )