Update setup.py

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

@@ -9,31 +9,28 @@ on:
         required: true
         default: 'dir'
 jobs:
-  build-linux:
+  build-linux-x86_64:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: mamba-org/setup-micromamba@v1
       with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
         environment-name: test
         environment-file: environment.yml
-        create-args: >-
+        init-shell: >-
-            python=3.10
+          bash
+        # create-args: >-
     - name: pip install cadquery CQ-editor ... etc
       shell: bash --login {0}
       run: |
         sudo apt install -y libblas-dev libblas3 libblas64-3 libblas64-dev
-        sudo apt install -y libxkbcommon0
+        sudo apt install -y libxkbcommon0 libxkbcommon-x11-0 libxcb-xinerama0
-        sudo apt install -y libxkbcommon-x11-0
-        sudo apt install -y libxcb-xinerama0
         sudo apt install -y qtbase5-dev qt5-qmake
         micromamba info
         pip install pyopengl
         pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
         pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi
-        pip install pyinstaller>=5.6 git+https://github.com/jdegenstein/pyinstaller-hooks-contrib
+        pip install pyinstaller>=5.6
         pip install path
         pip install jupyter-rfb
         pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
@@ -46,32 +43,34 @@ jobs:
     - name: Run build
       shell: bash --login {0}
       run: |
+        micromamba activate test
         micromamba info
-        pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
+        echo $LD_LIBRARY_PATH
+        export LD_LIBRARY_PATH=/home/runner/micromamba/envs/test/lib
+        echo $LD_LIBRARY_PATH
+        pyinstaller --log-level=DEBUG pyinstaller_pip.spec ${{ github.event.inputs.type }}
         cp /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
-    - uses: alehechka/upload-tartifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: CQ-editor-Linux-x86_64
         path: dist
-  build-macos:
+  build-macos-x86_64:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: mamba-org/setup-micromamba@v1
       with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
         environment-name: test
         environment-file: environment.yml
-        create-args: >-
+        init-shell: >-
-            python=3.10
+            bash
     - name: pip install cadquery CQ-editor ... etc
       shell: bash --login {0}
       run: |
         micromamba info
         pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
         pip install --pre git+https://github.com/cadquery/cadquery casadi
-        pip install pyinstaller>=5.6 git+https://github.com/jdegenstein/pyinstaller-hooks-contrib
+        pip install pyinstaller>=5.6
         pip install path
         pip uninstall -y PyQt5
         pip install PyQt5==5.15.7
@@ -86,34 +85,72 @@ jobs:
     - name: Run build
       shell: bash --login {0}
       run: |
+        micromamba activate test
         micromamba info
         pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
-        cp /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.sh /Users/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/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
-    - uses: alehechka/upload-tartifact@v1
+    - uses: actions/upload-artifact@v4
       with:
-        name: CQ-editor-MacOS
+        name: CQ-editor-MacOS-x86_64
+        path: dist
+  build-macos-arm64:
+    runs-on: macos-14
+    steps:
+    - uses: actions/checkout@v4
+    - uses: mamba-org/setup-micromamba@v1
+      with:
+        environment-name: test
+        environment-file: environment.yml
+        init-shell: >-
+            bash
+    - name: pip install cadquery CQ-editor ... etc
+      shell: bash --login {0}
+      run: |
+        micromamba info
+        pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
+        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
+        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
+        pip install --pre git+https://github.com/cadquery/cadquery casadi
+        pip install pyinstaller>=5.6
+        pip install path
+        pip uninstall -y PyQt5
+        pip install PyQt5==5.15.10
+        pip install PyQtWebEngine==5.15.6
+        pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
+        pip install git+https://github.com/gumyr/bd_warehouse
+        pip install git+https://github.com/meadiode/cq_gears.git@main
+        pip install -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
+        pip install git+https://github.com/gumyr/build123d
+        pip install git+https://github.com/JustinSDK/cqMore
+        pip list
+    - name: Run build
+      shell: bash --login {0}
+      run: |
+        micromamba activate test
+        micromamba info
+        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:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: mamba-org/setup-micromamba@v1
       with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
         environment-name: test
         environment-file: environment.yml
         init-shell: >-
-            powershell
+            bash
-        create-args: >-
-            python=3.10
     - name: pip install cadquery CQ-editor ... etc
-      shell: powershell
+      shell: bash --login {0}
       run: |
         micromamba info
         pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
         pip install --pre git+https://github.com/cadquery/cadquery casadi
-        pip install pyinstaller>=5.6 git+https://github.com/jdegenstein/pyinstaller-hooks-contrib
+        pip install pyinstaller>=5.6
         pip install path
         pip install git+https://github.com/gumyr/cq_warehouse.git#egg=cq_warehouse
         pip install git+https://github.com/gumyr/bd_warehouse
@@ -123,12 +160,18 @@ jobs:
         pip install git+https://github.com/JustinSDK/cqMore
         pip list
     - name: Run build
-      shell: powershell
+      shell: bash --login {0}
       run: |
+        micromamba activate test
         micromamba info
         pyinstaller pyinstaller_pip.spec ${{ github.event.inputs.type }}
-        Copy-Item D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\pyinstaller\CQ-editor.cmd D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\
+        cp D:/a/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.cmd D:/a/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
-    - uses: alehechka/upload-tartifact@v2
+
+    - name: 7zip artifact (workaround for too many files during artifact upload)
+      shell: bash --login {0}
+      run: 7z a release.zip ./dist/*
+      
+    - uses: actions/upload-artifact@v4
       with:
         name: CQ-editor-Windows
-        path: dist
+        path: release.zip

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.10
+  - python=3.11
   - spyder=5
   - path
   - logbook

environment.yml

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

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/CQ-editor.sh

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

pyinstaller_pip.spec

@@ -14,13 +14,13 @@ 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-310-x86_64-linux-gnu.so'), '.')]
+    ocp_path = [(os.path.join(HOMEPATH, 'OCP.cpython-311-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-310-darwin.so'), '.')]
+    ocp_path = [(os.path.join(HOMEPATH, 'OCP.cpython-311-darwin.so'), '.')]
 elif sys.platform == 'win32':
     occt_dir = os.path.join(Path(sys.prefix), 'Library', 'share', 'opencascade')
-    ocp_path = [(os.path.join(HOMEPATH, 'OCP.cp310-win_amd64.pyd'), '.')]
+    ocp_path = [(os.path.join(HOMEPATH, 'OCP.cp311-win_amd64.pyd'), '.')]
 
 datas1, binaries1, hiddenimports1 = collect_all('debugpy')
 hiddenimports2 = collect_submodules('xmlrpc')

setup.py

@@ -26,7 +26,7 @@ setup(
             "CQ-editor = cq_editor.__main__:main",
         ]
     },
-    python_requires=">=3.8,<3.12",
+    python_requires=">=3.8,<3.13",
     install_requires=[
         "logbook>=1",
         "ipython",
@@ -35,5 +35,6 @@ setup(
         "requests>=2,<3",
         "spyder>=5,<6",
         "pyqtgraph",
+        "numpy >= 1.24.1, <2",
     ],
 )