Change conda related sections in the README and the docs (#980)

* Started assy solver refactoring

* First working version

* Added validation

+initial work on FixedPoint

* Fixed tests

* Unary constraints support and finish Fixed Point

* Added Fixed and FixedAxis

* Changed the locking logic

* Test for unary constraints

* Update cadquery/occ_impl/solver.py

Co-authored-by: Marcus Boyd <[email protected]>

* Simple validation test

* Change conda related section

* Update docs

* Quickstart update

* Fix typo

* Correct curl line

* Correct curl line in the docs

* PointOnLine constraint

* PointOnLine test

* FixedRotation and FixedRotationAxis

* FixedRotation test

* Describe PointOnLine

* Add new constraints to the docs

* Use gp_Intrinsic_XYZ

* Typos+clarification

Co-authored-by: Marcus Boyd <[email protected]>

Author: adam-urbanczyk

README.md

@@ -44,7 +44,7 @@ It is currently possible to use CadQuery for your own projects in 3 different wa
     * Linux [installation video](https://youtu.be/sjLTePOq8bQ)
     * Windows [installation video](https://youtu.be/3Tg_RJhqZRg)
 
-The easiest way to install CadQuery and its dependencies is using conda, which is included as part of an Anaconda/Miniconda installation. See the next section for an alternative to a full install of Anaconda that may be preferable to some users. The steps to install cadquery are as follows:
+The easiest way to install CadQuery and its dependencies is using conda, which is included as part of a [miniforge](https://github.com/conda-forge/miniforge) installation (other distributions can be used as well). See the next section for more details regarding conda. The steps to install cadquery are as follows:
 ```
 # Set up a new environment
 conda create -n cadquery
@@ -58,17 +58,27 @@ conda install -c conda-forge -c cadquery cadquery=master
 
 For those who are interested, the [OCP repository](https://github.com/CadQuery/OCP) contains the current OCCT wrapper used by CQ.
 
-### Alternative Anaconda Installation Method
+### Conda Installation
 
-For those unfamiliar (or uncomfortable) with Anaconda, it is probably best to install Miniconda to a local directory and to avoid running `conda init`. After performing a local directory installation, Miniconda can be activated via the [scripts,bin]/activate scripts. This will help avoid polluting and breaking the local Python installation. In Linux, the local directory installation method looks something like this:
+For those unfamiliar (or uncomfortable) with conda, it is probably best to install Miniforge to a local directory and to avoid running `conda init`. After performing a local directory installation, Miniforge can be activated via the [scripts,bin]/activate scripts. This will help avoid polluting and breaking the local Python installation. In Linux, the local directory installation method looks something like this:
 ```
-# Install the script to ~/miniconda
-wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-bash miniconda.sh -b -p $HOME/miniconda
+# Install the script to ~/miniforge
+wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O miniforge.sh
+bash miniforge.sh -b -p $HOME/miniforge
 
 # To activate and use Miniconda
-source $HOME/miniconda/bin/activate
+source $HOME/miniforge/bin/activate
 ```
+On Windows one can install locally as follows:
+```
+:: Install
+curl -L -o miniforge.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe
+start /wait "" miniforge.exe /InstallationType=JustMe /RegisterPython=0 /NoRegistry=1 /NoScripts=1 /S /D=%USERPROFILE%\Miniforge3
+
+:: Activate
+cmd /K ""%USERPROFILE%/Miniforge3/Scripts/activate.bat" "%USERPROFILE%/Miniforge3""
+```
+You might want to consider using `/NoScripts=0` to have an activation shortcut added to the start menu.
 
 ### CQ-editor GUI
 

cadquery/assembly.py

@@ -383,6 +383,10 @@ def solve(self) -> "Assembly":
                     locked.append(ents[b])
                     break
 
+        # Lock the first occuring entity if needed.
+        if not locked:
+            locked.append(0)
+
         locs = [self.objects[n].loc for n in ents]
 
         # construct the constraint mapping

doc/installation.rst

@@ -7,9 +7,27 @@ CadQuery 2 is based on
 `OCP <https://github.com/CadQuery/OCP>`_,
 which is a set of Python bindings for the open-source `OpenCascade <http://www.opencascade.com/>`_ modelling kernel.
 
-Anaconda or Miniconda (Python 3.x editions), Python 3.x
+Conda
 ----------------------------------------------
-CadQuery requires OCP and Python version 3.x
+In principle any conda distrubtion will work, but it is probably best to install `Miniforge <https://github.com/conda-forge/miniforge>`_ to a local directory and to avoid running `conda init`. After performing a local directory installation, Miniforge can be activated via the [scripts,bin]/activate scripts. This will help avoid polluting and breaking the local Python installation. In Linux/MacOS, the local directory installation method looks something like this::
+
+        # Install the script to ~/miniforge
+        wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh -O miniforge.sh
+        bash miniforge.sh -b -p $HOME/miniforge
+
+        # To activate and use Miniconda
+        source $HOME/miniforge/bin/activate
+
+On Windows one can install locally as follows::
+
+        :: Install
+        curl -L -o miniforge.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe
+        start /wait "" miniforge.exe /InstallationType=JustMe /RegisterPython=0 /NoRegistry=1 /NoScripts=1 /S /D=%USERPROFILE%\Miniforge3
+
+        :: Activate
+        cmd /K ""%USERPROFILE%/Miniforge3/Scripts/activate.bat" "%USERPROFILE%/Miniforge3""
+
+It might be worthwhile to consider using ``/NoScripts=0`` to have an activation shortcut added to the start menu.
 
 Command Line Installation
 ------------------------------------------

doc/quickstart.rst

@@ -8,10 +8,10 @@ CadQuery QuickStart
 
 Want a quick glimpse of what CadQuery can do?  This quickstart will demonstrate the basics of CadQuery using a simple example
 
-Prerequisites: Anaconda/Miniconda + CQ-editor running from an environment
+Prerequisites: conda + CQ-editor running from an environment
 ==============================================================
 
-If you have not already done so, follow the :ref:`installation`, to install Anaconda/Miniconda and CQ-editor.
+If you have not already done so, follow the :ref:`installation`, to install conda and CQ-editor.
 
 After installation, run CQ-editor: