Merge branch 'master' into status_bar

Author: mbway

README.md

@@ -13,6 +13,7 @@ CadQuery GUI editor based on PyQT supports Linux, Windows and Mac.
 
 ## Notable features
 
+* Automatic code reloading - you can use your favourite editor
 * OCCT based
 * Graphical debugger for CadQuery scripts
   * Step through script and watch how your model changes
@@ -23,27 +24,41 @@ CadQuery GUI editor based on PyQT supports Linux, Windows and Mac.
   * STL
   * STEP
 
-## Installation (Binary Builds)
+## Installation - Pre-Built Packages (Recommended)
 
-Stable release builds which do not require Anaconda are attached to the [latest release](https://github.com/CadQuery/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. 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.
+~~### Release Packages~~
 
-Development builds are also available, but you must be logged in to GitHub to get access. Click on the newest build with a green checkmark [here](https://github.com/jmwright/CQ-editor/actions?query=workflow%3Abuild), 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 batch (Windows) script in the root CQ-editor directory. The CQ-editor window should launch.
+~~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.~~
 
-## Installation (Anaconda)
+### Development Packages
 
-Use conda to install:
+Development builds are also available, but can be unstable and should be used at your own risk. You can download the newest build [here](https://github.com/CadQuery/CQ-editor/releases/tag/nightly). Install and run the `run.sh` (Linux/MacOS) or `run.bat` (Windows) script in the root CQ-editor directory. The CQ-editor window should launch.
+
+### MacOS workarounds
+
+On later MacOS versions you may also need `xattr -r -d com.apple.quarantine path/to/CQ-editor-MacOS`.
+
+## Installation (conda/mamba)
+
+Use conda or mamba to install:
 ```
-conda install -c cadquery -c conda-forge cq-editor=master
+mamba install -c cadquery -c conda-forge cq-editor=master
 ```
 and then simply type `cq-editor` to run it. This installs the latest version built directly from the HEAD of this repository.
 
 Alternatively clone this git repository and set up the following conda environment:
 ```
-conda env create -f cqgui_env.yml -n cqgui
-conda activate cqgui
+mamba env create -f cqgui_env.yml -n cqgui
+mamba activate cqgui
 python run.py
 ```
 
+If you are concerned about mamba/conda modifying your shell settings, you can use [micromamba](https://mamba.readthedocs.io/en/latest/user_guide/micromamba.html):
+```
+micromamba install -n base -c cadquery cq-editor
+micromamba run -n base cq-editor
+```
+
 On some linux distributions (e.g. `Ubuntu 18.04`) it might be necessary to install additonal packages:
 ```
 sudo apt install libglu1-mesa libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev
@@ -57,10 +72,10 @@ dnf install -y mesa-libGLU mesa-libGL mesa-libGLU-devel
 
 ### Showing Objects
 
-By default, CQ-editor will display a 3D representation of all `Workplane` objects in a script with a default color and alpha (transparency). To have more control over what is shown, and what the color and alpha settings are, the `show_object` method can be used. `show_object` tells CQ-editor to explicity display an object, and accepts the `options` parameter. The `options` parameter is a dictionary of rendering options named `alpha` and `color`. `alpha` is scaled between 0.0 and 1.0, with 0.0 being completely opaque and 1.0 being completely transparent. The color is set using R (red), G (green) and B (blue) values, and each one is scaled from 0 to 255. Either option or both can be omitted.
+By default, CQ-editor will display a 3D representation of all `Workplane` objects in a script with a default color and alpha (transparency). To have more control over what is shown, and what the color and alpha settings are, the `show_object` method can be used. `show_object` tells CQ-editor to explicity display an object, and accepts the `options` parameter. The `options` parameter is a dictionary of rendering options named `alpha` and `color`. `alpha` is scaled between 0.0 and 1.0, with 0.0 being completely opaque and 1.0 being completely transparent. The color is set using R (red), G (green) and B (blue) values, and each one is scaled from 0 to 255. Either option or both can be omitted. The `name` parameter can assign a custom name which will appear in the objects pane of CQ-editor.
 
 ```python
-show_object(result, options={"alpha":0.5, "color": (64, 164, 223)})
+show_object(result, name="somename", options={"alpha":0.5, "color": (64, 164, 223)})
 ```
 
 Note that `show_object` works for `Shape` and `TopoDS_Shape` objects too. In order to display objects from the embedded Python console use `show`.
@@ -116,7 +131,7 @@ Any object can be exported to either STEP or STL format. The steps for doing so
 1. Highlight the object to be exported in the _Objects_ panel.
 2. Click either `Export as STL` or `Export as STEP` from the `Tools` menu, depending on which file format you want to export. Both of these options will be disabled if an object is not selected in the _Objects_ panel.
 
-Clicking either _Export_ item will present a file dialog that allows the file name ad location of the export file to be set.
+Clicking either _Export_ item will present a file dialog that allows the file name and location of the export file to be set.
 
 ### Displaying All Wires for Debugging
 

appveyor.yml

@@ -1,11 +1,8 @@
 shallow_clone: false
 
 image:
-#    - macOS-mojave
-#    - macOS
-    - Ubuntu
-    - Ubuntu1804
-    - Visual Studio 2015    
+    - Ubuntu2004
+    - Visual Studio 2015
 
 environment:
     matrix:
@@ -16,23 +13,21 @@ 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
-    - sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE != "macOS"* ]]; then curl -o miniconda.sh curl -o miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh; fi
-    - sh: if [[ $APPVEYOR_BUILD_WORKER_IMAGE == "macOS"* ]]; then curl -o miniconda.sh curl -o miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-4.7.10-MacOSX-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-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: appveyor DownloadFile https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe
-    - cmd: Miniconda3-latest-Windows-x86_64.exe /S /InstallationType=JustMe /D=%MINICONDA_DIRNAME%
+    - cmd: curl -fsSL -o miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe
+    - cmd: miniconda.exe /S /InstallationType=JustMe /D=%MINICONDA_DIRNAME%
     - cmd: set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
     - cmd: activate
-    - conda config --set always_yes yes
-    - conda install -c conda-forge python=3.7
-    - conda info
-    - conda env create --name cqgui -f cqgui_env.yml
+    - mamba info
+    - mamba env create --name cqgui -f cqgui_env.yml
     - sh: source activate cqgui
     - cmd: activate cqgui
-    - conda list
-    - pip install pytest pluggy pytest-qt
-    - pip install pytest-mock pytest-cov pytest-repeat codecov pyvirtualdisplay==0.2.1
+    - mamba list
+    - mamba install -y pytest pluggy pytest-qt
+    - mamba install -y pytest-mock pytest-cov pytest-repeat codecov pyvirtualdisplay
 
 build: false
 

azure-pipelines.yml

@@ -3,6 +3,8 @@ trigger:
     include:
       - master
       - refs/tags/*
+    exclude:
+      - refs/tags/nightly
 
 pr:
 - master
@@ -14,51 +16,73 @@ resources:
       name: CadQuery/conda-packages
       endpoint: CadQuery
 
-jobs:
-- template: conda-build.yml@templates
-  parameters:
-    name: Linux
-    vmImage: 'ubuntu-18.04'
-    py_maj: 3
-    py_min: 8
-    conda_bld: '3.20.3'
+parameters:
+  - name: minor
+    type: object
+    default:
+      - 11
 
-- template: conda-build.yml@templates
-  parameters:
-    name: macOS
-    vmImage: 'macOS-10.15'
-    py_maj: 3
-    py_min: 8
-    conda_bld: '3.20.3'
+stages:     
+- stage: build_conda_package
+  jobs:
+  - ${{ each minor in parameters.minor }}:
+    - template: conda-build.yml@templates
+      parameters:
+        name: Linux
+        vmImage: 'ubuntu-latest'
+        py_maj: 3
+        py_min: ${{minor}}
+        conda_bld: 3.21.6
 
-- template: conda-build.yml@templates
-  parameters:
-    name: Windows
-    vmImage: 'vs2017-win2016'
-    py_maj: 3
-    py_min: 8
-    conda_bld: '3.20.3'
+- stage: build_installers
+  jobs:
+  - template: constructor-build.yml@templates
+    parameters:
+      name: linux
+      vmImage: 'ubuntu-latest'
+  - template: constructor-build.yml@templates
+    parameters:
+      name: win
+      vmImage: 'windows-latest'
+  - template: constructor-build.yml@templates
+    parameters:
+      name: macos
+      vmImage: 'macOS-latest'
 
-- template: conda-build.yml@templates
-  parameters:
-    name: Linux
-    vmImage: 'ubuntu-18.04'
-    py_maj: 3
-    py_min: 9
-    conda_bld: '3.21.4'
+- stage: upload_installers
+  jobs:
+  - job: upload_to_github
+    condition: ne(variables['Build.Reason'], 'PullRequest')
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - download: current
+      artifact: installer_ubuntu-latest
+    - download: current
+      artifact: installer_windows-latest
+    - download: current
+      artifact: installer_macOS-latest
+    - bash: cp $(Pipeline.Workspace)/installer*/*.* .
+    - task: GitHubRelease@1
+      inputs:
+        gitHubConnection: github.com_oauth
+        assets: CQ-editor-*.*
+        action: edit
+        tag: nightly
+        target: d8e247d15001bf785ef7498d922b4b5aa017a9c9
+        addChangeLog: false
+        assetUploadMode: replace
+        isPreRelease: true
 
-- template: conda-build.yml@templates
-  parameters:
-    name: macOS
-    vmImage: 'macOS-10.15'
-    py_maj: 3
-    py_min: 9
-    conda_bld: '3.21.4'
-
-- template: conda-build.yml@templates
-  parameters:
-    name: Windows
-    vmImage: 'vs2017-win2016'
-    py_maj: 3
-    py_min: 9
-    conda_bld: '3.21.4'
+# stage left for debugging, disabled by default
+- stage: verify
+  condition: False 
+  jobs:
+  - job: verify_linux
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - download: current
+      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

conda/construct.yaml

@@ -0,0 +1,24 @@
+name: CQ-editor
+company: Cadquery
+version: master
+icon_image: ../icons/cadquery_logo_dark.ico
+license_file: ../LICENSE
+register_python: False
+initialize_conda: False
+keep_pkgs: False
+
+channels:
+  - conda-forge
+  - cadquery
+
+specs:
+  - cq-editor=master
+  - cadquery=master
+  - nomkl
+  - mamba
+
+menu_packages: []
+
+extra_files:
+  - run.sh # [unix]
+  - run.bat # [win]

conda/meta.yaml

@@ -6,28 +6,29 @@ source:
   path: ..
 
 build:
-  string: {{ 'py'+environ.get('PYTHON_VERSION')}}
+  string: {{ GIT_DESCRIBE_TAG }}_{{ GIT_BUILD_STR }}
+  noarch: python
   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:
-    - python {{ environ.get('PYTHON_VERSION') }}
+    - python >=3.8
     - setuptools
 
   run:
-    - python {{ environ.get('PYTHON_VERSION') }}
+    - python >=3.8
     - cadquery=master
     - ocp
     - logbook
     - pyqt=5.*
     - pyqtgraph
-    - spyder=4.*
-    - path.py
+    - spyder=5.*
+    - path
     - logbook
     - requests
-
+    - qtconsole=5.4.1
 test:
   imports:
     - cq_editor

conda/run.bat

@@ -0,0 +1,2 @@
+@echo off
+start /B Scripts\conda.exe run -n base python Scripts\cq-editor-script.py

conda/run.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec bin/cq-editor

cq_editor/__main__.py

@@ -13,16 +13,12 @@
 
 def main():
 
-    win = MainWindow()
-
     parser = argparse.ArgumentParser(description=NAME)
     parser.add_argument('filename',nargs='?',default=None)
 
     args = parser.parse_args(app.arguments()[1:])
-    print(args)
-    if args.filename:
-        win.components['editor'].load_from_file(args.filename)
 
+    win = MainWindow(filename=args.filename if args.filename else None)
     win.show()
     sys.exit(app.exec_())