Delete pyinstaller.spec

Delete .github/workflows/pyinstaller-builds-actions.yml
Delete .github/workflows/pyinstaller-builds-actions-mmamba.yml
2024-01-02 11:46:25 -06:00 · 2024-01-02 11:46:13 -06:00 · 2024-01-02 11:46:06 -06:00 · 2024-01-02 11:45:55 -06:00 · 2024-01-02 11:45:33 -06:00 · 2024-01-02 10:56:34 -06:00
9 changed files with 20 additions and 597 deletions
--- a/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
+++ b/.github/workflows/pyinstaller-builds-actions-PIP-TAR.yml
@@ -10,7 +10,7 @@ on:
        default: 'dir'
 jobs:
  build-linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v3
    - uses: mamba-org/setup-micromamba@v1
@@ -37,6 +37,7 @@ jobs:
        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
@@ -76,6 +77,7 @@ jobs:
        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
@@ -114,6 +116,7 @@ jobs:
        pip install pyinstaller>=5.6 git+https://github.com/jdegenstein/pyinstaller-hooks-contrib
        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
--- 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/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/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,6 +9,7 @@ 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':
@@ -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'],
@@ -50,13 +53,13 @@ a = Analysis(['run.py'],

 # 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'),
-    ]
+# 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,
Author	SHA1	Message	Date
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
jdegenstein	f52fc4dd42	remove getfullnameof in pyinstaller_pip.spec changes in pyinstaller>=6.0.0 removed getfullnameof	2023-09-25 10:53:38 -05:00