PERMANENT DRAFT:

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

@@ -0,0 +1,177 @@
+name: build-PIP-TAR
+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-x86_64:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+    - uses: mamba-org/setup-micromamba@v1
+      with:
+        environment-name: test
+        environment-file: environment.yml
+        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 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
+        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
+        pip install git+https://github.com/JustinSDK/cqMore
+        pip list
+    - name: Run build
+      shell: bash --login {0}
+      run: |
+        micromamba activate test
+        micromamba info
+        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: actions/upload-artifact@v4
+      with:
+        name: CQ-editor-Linux-x86_64
+        path: dist
+  build-macos-x86_64:
+    runs-on: macos-13
+    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 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
+        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-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@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: release.zip

README.md

@@ -1,5 +1,16 @@
 # CadQuery editor
 
+<<<<<<< HEAD
+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.
+
+Running into issues? Please click here to join the [***CadQuery, CQ-Editor, and build123d Discord***](https://discord.com/invite/Bj9AQPsCfx)
+
+![image](https://user-images.githubusercontent.com/16868537/191054760-a2cac297-3488-48d4-b9f6-52747dffcce3.png)
+
+=======
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
 [![Build status](https://ci.appveyor.com/api/projects/status/g98rs7la393mgy91/branch/master?svg=true)](https://ci.appveyor.com/project/adam-urbanczyk/cq-editor/branch/master)
 [![codecov](https://codecov.io/gh/CadQuery/CQ-editor/branch/master/graph/badge.svg)](https://codecov.io/gh/CadQuery/CQ-editor)
 [![Build Status](https://dev.azure.com/cadquery/CQ-editor/_apis/build/status/CadQuery.CQ-editor?branchName=master)](https://dev.azure.com/cadquery/CQ-editor/_build/latest?definitionId=3&branchName=master)
@@ -13,7 +24,10 @@ CadQuery GUI editor based on PyQT supports Linux, Windows and Mac.
 
 ## Notable features
 
+<<<<<<< HEAD
+=======
 * Automatic code reloading - you can use your favourite editor
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
 * OCCT based
 * Graphical debugger for CadQuery scripts
   * Step through script and watch how your model changes
@@ -26,6 +40,27 @@ CadQuery GUI editor based on PyQT supports Linux, Windows and Mac.
 
 ## Installation - Pre-Built Packages (Recommended)
 
+<<<<<<< HEAD
+### Release Packages
+
+Stable release builds which do not require Anaconda are attached to the [latest release](https://github.com/jdegenstein/jmwright-CQ-editor/releases). Download the zip file for your operating system, extract it, and run the CQ-editor script for your OS (CQ-editor.cmd for Windows, CQ-editor.sh for Linux and MacOS). On Windows you should be able to simply double-click on CQ-editor.cmd. On Linux and MacOS you may need to make the script executable with `chmod +x CQ-editor.sh` and run the script from the command line. On later MacOS versions you may also need `xattr -r -d com.apple.quarantine path/to/CQ-editor-MacOS`.  The script contains an environment variable export that may be required to get CQ-editor to launch correctly on MacOS Big Sur, so it is better to use the script than to launch CQ-editor directly.
+
+### Development Packages
+
+Development builds are also available, but can be unstable and should be used at your own risk. Click on the newest build with a green checkmark [here](https://github.com/jdegenstein/jmwright-CQ-editor/actions), wait for the _Artifacts_ section at the bottom of the page to load, and then click on the appropriate download for your operating system. Extract the archive file and run the shell (Linux/MacOS) or cmd (Windows) script in the root CQ-editor directory. The CQ-editor window should launch.
+
+## Installation (pip)
+
+Additional packages for Linux (known as needed on Ubuntu 22.04):
+```
+sudo apt install qtbase5-dev qt5-qmake
+```
+All platforms (Windows/Mac/Linux):
+```
+pip install git+https://github.com/jdegenstein/jmwright-CQ-Editor
+pip install --pre "cadquery>=2.2"
+pip install git+https://github.com/gumyr/build123d
+=======
 ~~### Release Packages~~
 
 ~~Stable release builds which do not require Anaconda are attached to the [latest release](https://github.com/CadQuery/CQ-editor/releases). Download installer for your operating system, extract it, and run the CQ-editor script for your OS (CQ-editor.cmd for Windows, CQ-editor.sh for Linux and MacOS). On Windows you should be able to simply double-click on CQ-editor.cmd. On Linux and MacOS you may need to make the script executable with `chmod +x CQ-editor.sh` and run the script from the command line. The script contains an environment variable export that may be required to get CQ-editor to launch correctly on MacOS Big Sur, so it is better to use the script than to launch CQ-editor directly.~~
@@ -66,6 +101,7 @@ sudo apt install libglu1-mesa libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev
 On Fedora 29 the packages can be installed as follows:
 ```
 dnf install -y mesa-libGLU mesa-libGL mesa-libGLU-devel
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
 ```
 
 ## Usage
@@ -76,6 +112,11 @@ By default, CQ-editor will display a 3D representation of all `Workplane` object
 
 ```python
 show_object(result, name="somename", options={"alpha":0.5, "color": (64, 164, 223)})
+<<<<<<< HEAD
+# or using rand_color:
+show_object(result, name="somename", options=rand_color(alpha=.5))
+=======
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
 ```
 
 Note that `show_object` works for `Shape` and `TopoDS_Shape` objects too. In order to display objects from the embedded Python console use `show`.

appveyor.yml

@@ -2,6 +2,10 @@ shallow_clone: false
 
 image:
     - Ubuntu2004
+<<<<<<< HEAD
+    - Ubuntu1804
+=======
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
     - Visual Studio 2015
 
 environment:
@@ -13,11 +17,19 @@ environment:
 
 install:
     - sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE != "macOS"* ]]; then sudo apt update; sudo apt -y --force-yes install libglu1-mesa xvfb libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev; fi
+<<<<<<< HEAD
+    - sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE != "macOS"* ]]; then curl -fsSL -o miniconda.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh; fi
+    - sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE == "macOS"* ]]; then curl -fsSL -o miniconda.sh https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-MacOSX-x86_64.sh; fi
+    - sh: bash miniconda.sh -b -p $HOME/miniconda
+    - sh: source $HOME/miniconda/bin/activate
+    - cmd: curl -fsSL -o miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe
+=======
     - sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE != "macOS"* ]]; then curl -fsSL -o miniconda.sh https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh; fi
     - sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE == "macOS"* ]]; then curl -fsSL -o miniconda.sh https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Darwin-x86_64.sh; fi
     - sh: bash miniconda.sh -b -p $HOME/miniconda
     - sh: source $HOME/miniconda/bin/activate
     - cmd: curl -fsSL -o miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
     - cmd: miniconda.exe /S /InstallationType=JustMe /D=%MINICONDA_DIRNAME%
     - cmd: set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
     - cmd: activate

azure-pipelines.yml

@@ -3,8 +3,11 @@ trigger:
     include:
       - master
       - refs/tags/*
+<<<<<<< HEAD
+=======
     exclude:
       - refs/tags/nightly
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
 
 pr:
 - master
@@ -13,13 +16,48 @@ resources:
   repositories:
     - repository: templates
       type: github
+<<<<<<< HEAD
+      name: jmwright/conda-packages
+=======
       name: CadQuery/conda-packages
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
       endpoint: CadQuery
 
 parameters:
   - name: minor
     type: object
     default:
+<<<<<<< HEAD
+      - 8
+      - 9
+      - 10
+
+jobs:
+- ${{ each minor in parameters.minor }}:
+  - template: conda-build.yml@templates
+    parameters:
+      name: Linux
+      vmImage: 'ubuntu-18.04'
+      py_maj: 3
+      py_min: ${{minor}}
+      conda_bld: 3.21.6
+
+  - template: conda-build.yml@templates
+    parameters:
+      name: macOS
+      vmImage: 'macOS-10.15'
+      py_maj: 3
+      py_min: ${{minor}}
+      conda_bld: 3.21.6
+
+  - template: conda-build.yml@templates
+    parameters:
+      name: Windows
+      vmImage: 'windows-latest'
+      py_maj: 3
+      py_min: ${{minor}}
+      conda_bld: 3.21.6
+=======
       - 11
 
 stages:     
@@ -86,3 +124,4 @@ stages:
       artifact: installer_ubuntu-latest
     - bash: cp $(Pipeline.Workspace)/installer*/*.* .
     - bash: sh ./CQ-editor-master-Linux-x86_64.sh -b -p dummy && cd dummy && ./run.sh
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b

conda/meta.yaml

@@ -6,19 +6,31 @@ source:
   path: ..
 
 build:
+<<<<<<< HEAD
+  string: {{ 'py'+environ.get('PYTHON_VERSION')}}
+=======
   string: {{ GIT_DESCRIBE_TAG }}_{{ GIT_BUILD_STR }}
   noarch: python
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
   script: python setup.py install --single-version-externally-managed --record=record.txt
   entry_points:
     - cq-editor = cq_editor.__main__:main
     - CQ-editor = cq_editor.__main__:main
 requirements:
   build:
+<<<<<<< HEAD
+    - python {{ environ.get('PYTHON_VERSION') }}
+    - setuptools
+
+  run:
+    - python {{ environ.get('PYTHON_VERSION') }}
+=======
     - python >=3.8
     - setuptools
 
   run:
     - python >=3.8
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
     - cadquery=master
     - ocp
     - logbook
@@ -28,7 +40,11 @@ requirements:
     - path
     - logbook
     - requests
+<<<<<<< HEAD
+
+=======
     - qtconsole=5.4.1
+>>>>>>> d746c8e8e6d80f53dc931ddc4910d4c791d7218b
 test:
   imports:
     - cq_editor