Update setup.py

pyinstaller-builds-actions-PIP-TAR.yml -> re-enable macos/windows builds after fixing linux build
2024-10-05 23:38:36 +02:00 · 2024-10-05 23:35:38 +02:00 · 2024-09-18 20:45:07 -05:00 · 2024-09-18 14:59:00 -05:00 · 2024-09-18 11:00:27 -05:00 · 2024-09-18 10:59:29 -05:00
17 changed files with 108 additions and 637 deletions
--- a/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
+++ b/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
@@ -9,34 +9,32 @@ on:
        required: true
        default: 'dir'
 jobs:
-  build-linux:
-    runs-on: ubuntu-20.04
+  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: >-
-            python=3.10
+        init-shell: >-
+          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 libxkbcommon-x11-0
-        sudo apt install -y libxcb-xinerama0
+        sudo apt install -y libxkbcommon0 libxkbcommon-x11-0 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
+        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
@@ -45,37 +43,40 @@ 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:
-    runs-on: macos-latest
+  build-macos-x86_64:
+    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: >-
-            python=3.10
+        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 --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
        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
@@ -84,48 +85,93 @@ 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/
-    - uses: alehechka/upload-tartifact@v1
+        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
+        name: CQ-editor-MacOS-x86_64
        path: dist
-  build-windows:
-    runs-on: windows-latest
+  build-macos-arm64:
+    runs-on: macos-14
    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
-        create-args: >-
-            python=3.10
+            bash
    - 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 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 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.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: 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\
-    - uses: alehechka/upload-tartifact@v2
+        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@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 --pre git+https://github.com/cadquery/cadquery casadi
+        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
+        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 D:/a/jmwright-CQ-Editor/jmwright-CQ-Editor/pyinstaller/CQ-editor.cmd D:/a/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/
+
+    - 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
--- a/.github/workflows/pyinstaller-builds-actions-build-PIP-TAR-pyinst5-6p.yml
+++ b/.github/workflows/pyinstaller-builds-actions-build-PIP-TAR-pyinst5-6p.yml
@@ -1,126 +0,0 @@
-name: build-PIP-TAR-pyinst5-6p
-on:
-  # schedule:
-    # - cron: '0 0 * * 1'
-  workflow_dispatch:
-    inputs:
-      type:
-        description: 'Whether to build a single file (onefile) or directory (dir) dist'
-        required: true
-        default: 'dir'
-jobs:
-  # build-linux:
-    # runs-on: ubuntu-20.04
-    # steps:
-    # - uses: actions/checkout@v2
-    # - uses: mamba-org/provision-with-micromamba@main
-      # with:
-        # #miniconda-version: "latest"
-        # #auto-update-conda: true
-        # environment-name: test
-        # environment-file: environment.yml
-        # extra-specs:
-            # python=3.9
-    # - name: Mamba install CadQuery and pyinstaller
-      # 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 libxkbcommon-x11-0
-        # sudo apt install -y libxcb-xinerama0
-        # micromamba info
-        # pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
-        # pip install -vvv --pre git+https://github.com/cadquery/cadquery casadi==3.5.5
-        # pip install pyinstaller==4.10
-        # pip install path
-        # 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 -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-        # pip install git+https://github.com/gumyr/build123d.git#egg=build123d
-        # pip install git+https://github.com/JustinSDK/cqMore
-        # pip list
-    # - name: Run build
-      # shell: bash --login {0}
-      # run: |
-        # micromamba info
-        # pyinstaller 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@v1
-      # with:
-        # name: CQ-editor-Linux-x86_64
-        # path: dist
-  # build-macos:
-    # runs-on: macos-latest
-    # steps:
-    # - uses: actions/checkout@v2
-    # - uses: mamba-org/provision-with-micromamba@main
-      # with:
-        # #miniconda-version: "latest"
-        # #auto-update-conda: true
-        # environment-name: test
-        # environment-file: environment.yml
-        # extra-specs:
-            # python=3.9
-    # - name: Mamba install CadQuery and pyinstaller
-      # 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==3.5.5
-        # pip install pyinstaller==4.10
-        # pip install path
-        # pip uninstall -y PyQt5
-        # pip install PyQt5==5.15.7
-        # 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/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.git#egg=build123d
-        # pip install git+https://github.com/JustinSDK/cqMore
-        # pip list
-    # - name: Run build
-      # shell: bash --login {0}
-      # run: |
-        # 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/
-    # - uses: alehechka/upload-tartifact@v1
-      # with:
-        # name: CQ-editor-MacOS
-        # path: dist
-  build-windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: mamba-org/provision-with-micromamba@main
-      with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
-        environment-name: test
-        environment-file: environment.yml
-        extra-specs:
-            python=3.9
-    - name: pip install cadquery CQ-editor ... etc
-      shell: powershell
-      run: |
-        micromamba info
-        pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
-        pip install --pre git+https://github.com/cadquery/cadquery casadi==3.5.5
-        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/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: powershell
-      run: |
-        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\
-    - uses: alehechka/upload-tartifact@v1
-      with:
-        name: CQ-editor-Windows
-        path: dist
--- a/.github/workflows/pyinstaller-builds-actions-mmamba-TAR.yml
+++ b/.github/workflows/pyinstaller-builds-actions-mmamba-TAR.yml
@@ -1,122 +0,0 @@
-name: build-micromamba-DEV
-on:
-  schedule:
-    - cron: '0 0 * * 1'
-  workflow_dispatch:
-    inputs:
-      type:
-        description: 'Whether to build a single file (onefile) or directory (dir) dist'
-        required: true
-        default: 'dir'
-jobs:
-  # build-linux:
-    # runs-on: ubuntu-latest
-    # steps:
-    # - uses: actions/checkout@v2
-    # - uses: mamba-org/provision-with-micromamba@main
-      # with:
-        # #miniconda-version: "latest"
-        # #auto-update-conda: true
-        # environment-name: test
-        # environment-file: environment.yml
-        # extra-specs:
-            # python=3.9
-    # - name: Mamba install CadQuery and pyinstaller
-      # 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 libxkbcommon-x11-0
-        # sudo apt install -y libxcb-xinerama0
-        # micromamba info
-        # micromamba install -c cadquery -c conda-forge cq-editor=master cadquery=master debugpy ipython=8.4.0 jedi=0.17.2 python=3.9
-        # micromamba install -c conda-forge pyinstaller=4.10
-        # pip install path
-        # 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 -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-        # pip install git+https://github.com/gumyr/build123d.git#egg=build123d
-        # pip install git+https://github.com/JustinSDK/cqMore
-    # - name: Run build
-      # shell: bash --login {0}
-      # run: |
-        # micromamba info
-        # pyinstaller pyinstaller.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: actions/upload-artifact@v2
-      # with:
-        # name: CQ-editor-Linux-x86_64
-        # path: dist
-  # build-macos:
-    # runs-on: macos-latest
-    # steps:
-    # - uses: actions/checkout@v2
-    # - uses: mamba-org/provision-with-micromamba@main
-      # with:
-        # #miniconda-version: "latest"
-        # #auto-update-conda: true
-        # environment-name: test
-        # environment-file: environment.yml
-        # extra-specs:
-            # python=3.9
-    # - name: Mamba install CadQuery and pyinstaller
-      # shell: bash --login {0}
-      # run: |
-        # micromamba info
-        # micromamba install -c cadquery -c conda-forge cq-editor=master cadquery=master debugpy ipython=8.4.0 jedi=0.17.2 python=3.9
-        # micromamba install -c conda-forge pyinstaller
-        # pip install path
-        # pip uninstall -y PyQt5
-        # pip install PyQt5==5.15.7
-        # 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/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.git#egg=build123d
-        # pip install git+https://github.com/JustinSDK/cqMore
-    # - name: Run build
-      # shell: bash --login {0}
-      # run: |
-        # micromamba info
-        # pyinstaller pyinstaller.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/
-    # - uses: actions/upload-artifact@v2
-      # with:
-        # name: CQ-editor-MacOS
-        # path: dist
-  build-windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: mamba-org/provision-with-micromamba@main
-      with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
-        environment-name: test
-        environment-file: environment.yml
-        extra-specs:
-            python=3.9
-    - name: Mamba install CadQuery and pyinstaller
-      shell: powershell
-      run: |
-        micromamba install -c cadquery -c conda-forge cq-editor=master cadquery=master debugpy ipython=8.4.0 jedi=0.17.2 python=3.9
-        micromamba install -c conda-forge pyinstaller=4.10 casadi ipopt
-        pip install path
-        pip install pipwin
-        pipwin install numpy
-        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 -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-        pip install git+https://github.com/gumyr/build123d.git#egg=build123d
-        pip install git+https://github.com/JustinSDK/cqMore
-    - name: Run build
-      shell: powershell
-      run: |
-        micromamba info
-        pyinstaller --debug all pyinstaller.spec ${{ github.event.inputs.type }}
-        Copy-Item C:\Users\runneradmin\micromamba-root\envs\test\Library\bin\casadi_nlpsol_ipopt.dll  D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\CQ-editor\
-        Copy-Item 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@v1
-      with:
-        name: CQ-editor-Windows
-        path: dist
--- a/.github/workflows/pyinstaller-builds-actions-mmamba.yml
+++ b/.github/workflows/pyinstaller-builds-actions-mmamba.yml
@@ -1,121 +0,0 @@
-name: build-micromamba
-on:
-  schedule:
-    - cron: '0 0 * * 1'
-  workflow_dispatch:
-    inputs:
-      type:
-        description: 'Whether to build a single file (onefile) or directory (dir) dist'
-        required: true
-        default: 'dir'
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: mamba-org/provision-with-micromamba@main
-      with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
-        environment-name: test
-        environment-file: environment.yml
-        extra-specs:
-            python=3.9
-    - name: Mamba install CadQuery and pyinstaller
-      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 libxkbcommon-x11-0
-        sudo apt install -y libxcb-xinerama0
-        micromamba info
-        micromamba install -c cadquery -c conda-forge cq-editor=master cadquery=master debugpy ipython=8.4.0 jedi=0.17.2 python=3.9
-        micromamba install -c conda-forge pyinstaller=4.10
-        pip install path
-        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 -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-        pip install git+https://github.com/gumyr/build123d.git#egg=build123d
-        pip install git+https://github.com/JustinSDK/cqMore
-    - name: Run build
-      shell: bash --login {0}
-      run: |
-        micromamba info
-        pyinstaller pyinstaller.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: actions/upload-artifact@v2
-      with:
-        name: CQ-editor-Linux-x86_64
-        path: dist
-  build-macos:
-    runs-on: macos-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: mamba-org/provision-with-micromamba@main
-      with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
-        environment-name: test
-        environment-file: environment.yml
-        extra-specs:
-            python=3.9
-    - name: Mamba install CadQuery and pyinstaller
-      shell: bash --login {0}
-      run: |
-        micromamba info
-        micromamba install -c cadquery -c conda-forge cq-editor=master cadquery=master debugpy ipython=8.4.0 jedi=0.17.2 python=3.9
-        micromamba install -c conda-forge pyinstaller
-        pip install path
-        pip uninstall -y PyQt5
-        pip install PyQt5==5.15.7
-        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/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.git#egg=build123d
-        pip install git+https://github.com/JustinSDK/cqMore
-    - name: Run build
-      shell: bash --login {0}
-      run: |
-        micromamba info
-        pyinstaller pyinstaller.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/
-    - uses: actions/upload-artifact@v2
-      with:
-        name: CQ-editor-MacOS
-        path: dist
-  build-windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: mamba-org/provision-with-micromamba@main
-      with:
-        #miniconda-version: "latest"
-        #auto-update-conda: true
-        environment-name: test
-        environment-file: environment.yml
-        extra-specs:
-            python=3.9
-    - name: Mamba install CadQuery and pyinstaller
-      shell: powershell
-      run: |
-        micromamba install -c cadquery -c conda-forge cq-editor=master cadquery=master debugpy ipython=8.4.0 jedi=0.17.2 python=3.9
-        micromamba install -c conda-forge pyinstaller=4.10
-        pip install path
-        pip install pipwin
-        pipwin install numpy
-        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 -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-        pip install git+https://github.com/gumyr/build123d.git#egg=build123d
-        pip install git+https://github.com/JustinSDK/cqMore
-    - name: Run build
-      shell: powershell
-      run: |
-        micromamba info
-        pyinstaller --debug all pyinstaller.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\
-    - uses: actions/upload-artifact@v2
-      with:
-        name: CQ-editor-Windows
-        path: dist
--- a/.github/workflows/pyinstaller-builds-actions.yml
+++ b/.github/workflows/pyinstaller-builds-actions.yml
@@ -1,120 +0,0 @@
-name: build
-on:
-  schedule:
-    - cron: '0 0 * * 1'
-  workflow_dispatch:
-    inputs:
-      type:
-        description: 'Whether to build a single file (onefile) or directory (dir) dist'
-        required: true
-        default: 'dir'
-jobs:
-  # build-linux:
-    # runs-on: ubuntu-latest
-    # steps:
-    # - uses: actions/checkout@v2
-    # - uses: conda-incubator/setup-miniconda@v2
-      # with:
-        # mamba-version: "*"
-        # channels: conda-forge,defaults
-        # channel-priority: true
-        # # auto-update-conda: true
-        # python-version: 3.9
-        # activate-environment: test
-    # - name: Install CadQuery, CQ-editor and pyinstaller
-      # 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 libxkbcommon-x11-0
-        # sudo apt install -y libxcb-xinerama0
-        # conda info
-        # conda install -c cadquery -c conda-forge cq-editor=master cadquery=master python=3.9
-        # conda install -c conda-forge pyinstaller=4.10
-        # conda uninstall --force -y importlib_resources
-        # pip install path
-        # 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 -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-        # pip install git+https://github.com/gumyr/build123d.git#egg=build123d
-    # - name: Run build
-      # shell: bash --login {0}
-      # run: |
-        # conda info
-        # pyinstaller pyinstaller.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/
-        # rm /home/runner/work/jmwright-CQ-Editor/jmwright-CQ-Editor/dist/CQ-editor/libstdc++.so.6
-    # - uses: actions/upload-artifact@v2
-      # with:
-        # name: CQ-editor-Linux-x86_64
-        # path: dist
-  # build-macos:
-    # runs-on: macos-latest
-    # steps:
-    # - uses: actions/checkout@v2
-    # - uses: conda-incubator/setup-miniconda@v2
-      # with:
-        # mamba-version: "*"
-        # channels: conda-forge,defaults
-        # # auto-update-conda: true
-        # python-version: 3.9
-        # activate-environment: test
-    # - name: Install CadQuery, CQ-editor and pyinstaller=4.10
-      # shell: bash --login {0}
-      # run: |
-        # conda info
-        # conda install -c cadquery -c conda-forge cq-editor=master cadquery=master python=3.9
-        # conda install -c conda-forge pyinstaller
-        # conda uninstall --force -y importlib_resources
-        # pip install path
-        # pip uninstall -y PyQt5
-        # pip install PyQt5==5.15.7
-        # 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/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.git#egg=build123d
-    # - name: Run build
-      # shell: bash --login {0}
-      # run: |
-        # conda info
-        # pyinstaller pyinstaller.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/
-    # - uses: actions/upload-artifact@v2
-      # with:
-        # name: CQ-editor-MacOS
-        # path: dist
-  build-windows:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: conda-incubator/setup-miniconda@v2
-      with:
-        miniconda-version: "latest"
-        auto-update-conda: true
-        python-version: 3.9
-        activate-environment: test
-    - name: Install CadQuery and pyinstaller
-      shell: powershell
-      run: |
-        conda install -c cadquery -c conda-forge cq-editor=master cadquery=master ipython=7.20 python=3.9
-        conda install -c conda-forge pyinstaller=4.10
-        pip install pipwin
-        pipwin install numpy
-        pip install path
-        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 -e "git+https://github.com/CadQuery/cadquery-plugins.git#egg=cq_cache&subdirectory=plugins/cq_cache"
-        pip install git+https://github.com/gumyr/build123d.git#egg=build123d
-    - name: Run build
-      shell: powershell
-      run: |
-        conda info
-        pyinstaller --debug all pyinstaller.spec ${{ github.event.inputs.type }}
-        Copy-Item C:\Miniconda3\Library\bin\libssl-1_1-x64.dll  D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\CQ-editor\
-        Copy-Item C:\Miniconda3\Library\bin\libcrypto-1_1-x64.dll  D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\CQ-editor\
-        Copy-Item D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\pyinstaller\CQ-editor.cmd D:\a\jmwright-CQ-Editor\jmwright-CQ-Editor\dist\
-    - uses: actions/upload-artifact@v2
-      with:
-        name: CQ-editor-Windows
-        path: dist
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CadQuery editor

-This is a fork of [jmwright's fork](https://github.com/jmwright/CQ-editor) of [CadQuery/CQ-editor](https://github.com/CadQuery/CQ-editor). This fork includes changes that enable dark mode for CQ-editor (see screenshot below). Under the GitHub Actions menu this fork also contains static builds of CQ-editor for Linux/MacOS/Windows that include the [cq_gears](https://github.com/meadiode/cq_gears), [cq_cache](https://github.com/CadQuery/cadquery-plugins/tree/main/plugins/cq_cache), [cq_more](https://github.com/JustinSDK/cqMore), [cq_warehouse](https://github.com/gumyr/cq_warehouse), and [build123d](https://github.com/gumyr/build123d) libraries. Note you need to change color preferences to enable dark mode for all panes (see Edit -> Preferences).
+This is a fork of [jmwright's fork](https://github.com/jmwright/CQ-editor) of [CadQuery/CQ-editor](https://github.com/CadQuery/CQ-editor). This fork includes changes that enable dark mode for CQ-editor (see screenshot below). Under the GitHub Actions menu this fork also contains static builds of CQ-editor for Linux/MacOS/Windows that include the [cq_gears](https://github.com/meadiode/cq_gears), [cq_cache](https://github.com/CadQuery/cadquery-plugins/tree/main/plugins/cq_cache), [cq_more](https://github.com/JustinSDK/cqMore), [cq_warehouse](https://github.com/gumyr/cq_warehouse), [bd_warehouse](https://github.com/gumyr/bd_warehouse), and [build123d](https://github.com/gumyr/build123d) libraries. Note you need to change color preferences to enable dark mode for all panes (see Edit -> Preferences).

 This fork also contains additional changes to the `show_object` function in CQ-editor that make it easier to display and export build123d objects and object lists.

--- a/cq_editor/editor.py
+++ b/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)
--- a/cq_editor/widgets/debugger.py
+++ b/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)
--- a/cq_editor/widgets/editor.py
+++ b/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)
--- a/cqgui_env.yml
+++ b/cqgui_env.yml
@@ -5,7 +5,7 @@ channels:
 dependencies:
  - pyqt=5
  - pyqtgraph
-  - python=3.10
+  - python=3.11
  - spyder=5
  - path
  - logbook
--- a/environment.yml
+++ b/environment.yml
@@ -3,4 +3,4 @@ channels:
  - conda-forge
  - defaults
 dependencies:
-  - python=3.10
+  - python=3.11
--- a/pyinstaller.spec
+++ b/pyinstaller.spec
@@ -1,98 +0,0 @@
-# -*- mode: python -*-
-
-import sys, site, os
-from path import Path
-from PyInstaller.utils.hooks import collect_all, collect_submodules
-
-block_cipher = None
-
-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'
-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-39-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-39-darwin.so'), '.')
-elif sys.platform == 'win32':
-    occt_dir = os.path.join(Path(sys.prefix), 'Library', 'share', 'opencascade')
-    ocp_path = [(os.path.join(HOMEPATH, 'OCP.cp39-win_amd64.pyd'), '.')]
-    cas_DLL = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'casadi_nlpsol_ipopt.dll'), '.')]
-    ipo_DLL = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'ipopt-3.dll'), '.')]
-    bla_DLL = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'libblas.dll'), '.')]
-    lap_DLL = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'liblapack.dll'), '.')]
-    mum_DLL = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'dmumps.dll'), '.')]
-    fla_DLL = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'flang.dll'), '.')]
-    flr_DLL = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'flangrti.dll'), '.')]
-    omp_DLL = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'libomp.dll'), '.')]
-    mkl_DLLs = [(os.path.join(Path(sys.prefix), 'Library', 'bin', 'mkl*.dll'), '.')]
-    #cas_dllA = os.path.join(HOMEPATH, 'casadi', 'libcasadi.dll')
-    #cas_dllB = os.path.join(HOMEPATH, 'casadi', 'libcasadi_nlpsol_ipopt.dll')
-
-datas1, binaries1, hiddenimports1 = collect_all('debugpy')
-hiddenimports2 = collect_submodules('xmlrpc')
-
-a = Analysis(['run.py'],
-             pathex=['.'],
-             binaries=ocp_path + cas_DLL + ipo_DLL + bla_DLL + lap_DLL + mum_DLL + fla_DLL + flr_DLL + omp_DLL + mkl_DLLs + binaries1,
-             datas=[(spyder_data, 'spyder'),
-                    (occt_dir, 'opencascade'),
-                    (cqw_path, 'cq_warehouse'),
-                    (cq_path, 'cadquery')] +
-                    [(p, 'parso/python') for p in parso_grammar] + datas1,
-             hiddenimports=['ipykernel.datapub', 'debugpy', 'vtkmodules', 'vtkmodules.all',
-                            'pyqtgraph.graphicsItems.ViewBox.axisCtrlTemplate_pyqt5',
-                            'pyqtgraph.graphicsItems.PlotItem.plotConfigTemplate_pyqt5',
-                            'pyqtgraph.imageview.ImageViewTemplate_pyqt5', 'xmlrpc', 'ipopt', 'casadi',
-                            'zmq.backend', 'cq_warehouse', 'cq_warehouse.bearing', 'cq_warehouse.chain',
-                            'cq_warehouse.drafting', 'cq_warehouse.extensions', 'cq_warehouse.fastener',
-                            'cq_warehouse.sprocket', 'cq_warehouse.thread', 'cq_gears', 'cq_cache',
-                            'build123d', 'cqmore'] + hiddenimports1 + hiddenimports2,
-             hookspath=[],
-             runtime_hooks=['pyinstaller/pyi_rth_occ.py',
-                            'pyinstaller/pyi_rth_fontconfig.py'],
-             excludes=['_tkinter'],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher,
-             noarchive=False)
-
-# There is an issue that keeps the OpenSSL libraries from being copied to the output directory.
-# This should work if nothing else, but does not with GitHub Actions
-if sys.platform == 'win32':
-    from PyInstaller.depend.bindepend import getfullnameof
-    rel_data_path = ['PyQt5', 'Qt', 'bin']
-    a.datas += [
-        (getfullnameof('libssl-1_1-x64.dll'), os.path.join(*rel_data_path), 'DATA'),
-        (getfullnameof('libcrypto-1_1-x64.dll'), os.path.join(*rel_data_path), 'DATA'),
-    ]
-
-
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          [],
-          exclude_binaries=True,
-          name='CQ-editor',
-          debug=False,
-          bootloader_ignore_signals=False,
-          strip=False,
-          upx=True,
-          console=True,
-          icon='icons/cadquery_logo_dark.ico')
-
-exclude = ()
-#exclude = ('libGL','libEGL','libbsd')
-a.binaries = TOC([x for x in a.binaries if not x[0].startswith(exclude)])
-
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='CQ-editor')
--- a/pyinstaller/CQ-editor-mac.sh
+++ b/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
--- a/pyinstaller/CQ-editor.sh
+++ b/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
--- a/pyinstaller/extrahooks/hook-py_lib3mf.py
+++ b/pyinstaller/extrahooks/hook-py_lib3mf.py
@@ -0,0 +1,4 @@
+# hook-py_lib3mf.py
+from PyInstaller.utils.hooks import collect_dynamic_libs
+
+binaries = collect_dynamic_libs('py_lib3mf')
--- a/pyinstaller_pip.spec
+++ b/pyinstaller_pip.spec
@@ -9,17 +9,18 @@ block_cipher = None
 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'
 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')
@@ -29,6 +30,7 @@ a = Analysis(['run.py'],
             binaries=ocp_path + binaries1,
             datas=[(spyder_data, 'spyder'),
                    (cqw_path, 'cq_warehouse'),
+                    (bdw_path, 'bd_warehouse'),
                    (cq_path, 'cadquery')] +
                    [(p, 'parso/python') for p in parso_grammar] + datas1,
             hiddenimports=['ipykernel.datapub', 'debugpy', 'vtkmodules', 'vtkmodules.all',
@@ -38,7 +40,8 @@ a = Analysis(['run.py'],
                            'zmq.backend', 'cq_warehouse', 'cq_warehouse.bearing', 'cq_warehouse.chain',
                            'cq_warehouse.drafting', 'cq_warehouse.extensions', 'cq_warehouse.fastener',
                            'cq_warehouse.sprocket', 'cq_warehouse.thread', 'cq_gears', 'cq_cache',
-                            'build123d', 'cqmore'] + hiddenimports1 + hiddenimports2,
+                            'build123d', 'cqmore', 'bd_warehouse', 'bd_warehouse.pipe', 'bd_warehouse.flange',
+                            'bd_warehouse.thread', 'bd_warehouse.gears'] + hiddenimports1 + hiddenimports2,
             hookspath=['pyinstaller/extrahooks/'],
             runtime_hooks=['pyinstaller/pyi_rth_occ.py',
                            'pyinstaller/pyi_rth_fontconfig.py'],
--- a/setup.py
+++ b/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",
    ],
 )
Author	SHA1	Message	Date
Hendrie Bosch	f95e31b636	Update setup.py	2024-10-05 23:38:36 +02:00
Hendrie Bosch	3099fa560e	Update setup.py	2024-10-05 23:35:38 +02:00
jdegenstein	0e6b47e21e	pyinstaller-builds-actions-PIP-TAR.yml -> re-enable macos/windows builds after fixing linux build	2024-09-18 20:45:07 -05:00
jdegenstein	01ce43e1be	pyinstaller-builds-actions-PIP-TAR.yml -> set LD_LIBRARY_PATH	2024-09-18 14:59:00 -05:00
jdegenstein	0499f2dc69	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-09-18 11:00:27 -05:00
jdegenstein	5225408777	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-09-18 10:59:29 -05:00
jdegenstein	8748b35e9f	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-09-18 10:52:27 -05:00
jdegenstein	7a279ad9a7	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-09-18 09:36:44 -05:00
jdegenstein	cf3df6e95a	pyinstaller-builds-actions-PIP-TAR.yml -> add linux libssl3-dev install via apt and temporarily disable other builds	2024-09-18 09:32:10 -05:00
jdegenstein	7015e70f4a	pyinstaller-builds-actions-PIP-TAR.yml -> add mac-specific shell script	2024-09-17 14:59:07 -05:00
jdegenstein	f21b680ced	Create CQ-editor-mac.sh	2024-09-17 14:57:46 -05:00
jdegenstein	9579757c98	debugger.py -> abspath to absolute	2024-08-22 12:34:28 -05:00
jdegenstein	5d8f651f97	widgets/editor.py -> abspath to absolute	2024-08-22 12:34:12 -05:00
jdegenstein	7f01d73f54	editor.py -> abspath to absolute	2024-08-22 12:33:40 -05:00
jdegenstein	d657da605a	setup.py -> add numpy dep below v2	2024-08-22 12:27:06 -05:00
jdegenstein	5fdeda5076	pyinstaller-builds-actions-PIP-TAR.yml -> pip install self built macos arm64 nlopt	2024-06-05 08:45:57 -05:00
jdegenstein	ebdc391f3d	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-06-04 20:36:06 -05:00
jdegenstein	3ba85424c7	Update pyinstaller-builds-actions-PIP-TAR.yml -> use mainline pyinstaller-hooks-contrib	2024-06-04 14:09:54 -05:00
jdegenstein	069df10dd0	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-06-01 15:20:44 -05:00
jdegenstein	c2ba027cd5	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-06-01 09:54:33 -05:00
jdegenstein	9653933c2e	CQ-editor.sh workaround from issue #13	2024-05-30 20:44:56 -05:00
jdegenstein	7878bad430	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-05-30 15:21:05 -05:00
jdegenstein	80b9dd5bef	pyinstaller-builds-actions-PIP-TAR.yml	2024-05-30 14:48:30 -05:00
jdegenstein	67d64f67a7	pyinstaller-builds-actions-PIP-TAR.yml -> attempt to add macos-arm64	2024-05-30 14:40:50 -05:00
jdegenstein	4ae685aba2	pyinstaller-builds-actions-PIP-TAR.yml -> Fix win path for use with bash	2024-05-30 14:20:24 -05:00
jdegenstein	189c37e284	pyinstaller-builds-actions-PIP-TAR.yml -> shell: bash --login {0}	2024-05-30 14:06:37 -05:00
jdegenstein	8b63d10dc5	Update pyinstaller-builds-actions-PIP-TAR.yml	2024-05-30 13:59:06 -05:00
jdegenstein	38feb5ddc4	pyinstaller-builds-actions-PIP-TAR.yml -> activate environment	2024-05-30 13:49:42 -05:00
jdegenstein	0254de2be7	Update cqgui_env.yml python 3.11	2024-05-30 13:15:30 -05:00
jdegenstein	33e813dad8	pyinstaller_pip.spec -> python 3.11	2024-05-30 13:14:42 -05:00
jdegenstein	5354369dcd	environment.yml -> python=3.11	2024-05-30 13:14:04 -05:00
jdegenstein	20e8d623d0	pyinstaller-builds-actions-PIP-TAR.yml -> Updating actions and fixing MacOS/x86_64 builds	2024-05-30 13:13:05 -05:00
jdegenstein	f26f95396a	pyinstaller-builds-actions-PIP-TAR.yml -> update some GH actions for node20	2024-04-12 09:46:11 -05:00
jdegenstein	6fe767c0a4	Delete pyinstaller.spec	2024-01-02 11:46:25 -06:00
jdegenstein	1bb94c1d76	Delete .github/workflows/pyinstaller-builds-actions.yml	2024-01-02 11:46:13 -06:00
jdegenstein	003b9eb3f5	Delete .github/workflows/pyinstaller-builds-actions-mmamba.yml	2024-01-02 11:46:06 -06:00
jdegenstein	143d7712cd	Delete .github/workflows/pyinstaller-builds-actions-mmamba-TAR.yml	2024-01-02 11:45:55 -06:00
jdegenstein	aaf0d31b52	Delete .github/workflows/pyinstaller-builds-actions-build-PIP-TAR-pyinst5-6p.yml	2024-01-02 11:45:33 -06:00
jdegenstein	14d0477d1d	README.md -> add bd_warehouse	2024-01-02 10:56:34 -06:00
jdegenstein	5b0504f22b	pyinstaller_pip.spec -> add bd_warehouse	2024-01-02 10:55:24 -06:00
jdegenstein	3ed0deff41	pyinstaller-builds-actions-PIP-TAR.yml -> install bd_warehouse	2024-01-02 10:49:14 -06:00
jdegenstein	e00e40c7b0	Update pyinstaller-builds-actions-PIP-TAR.yml back to python 3.10	2023-10-30 13:44:07 -05:00
jdegenstein	035b95c508	Update pyinstaller-builds-actions-PIP-TAR.yml bump to Ubuntu-22.04 and python 3.11	2023-10-30 13:42:10 -05:00
jdegenstein	656426f645	Delete pyinstaller/extrahooks/hook-rtree.py fixed on pyinstaller hooks contrib, this file did not produce working linux builds anyway	2023-10-26 13:40:46 -05:00
jdegenstein	ab6526c1fe	Create hook-rtree.py	2023-10-20 15:19:04 -05:00
jdegenstein	d8c4e5bfac	Create hook-py_lib3mf.py	2023-10-20 14:01:40 -05:00