Skip to content

Commit 1129a1c

Browse files
committed
Update version 2.2.0 conda installation instructions
1 parent 21243ee commit 1129a1c

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

doc/installation.rst

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ Note that miniforge automatically sets *conda-forge* as the default channel. ``
4747
conda
4848
`````
4949

50-
Install the latest released version of cadquery::
50+
Install the latest released version of cadquery [#f1]_::
5151

5252
conda create -n cqrel
5353
conda activate cqrel
54-
conda install -c conda-forge cadquery
54+
conda install -c conda-forge cadquery occt=7.7.0
5555

56-
or install a given version of cadquery::
56+
or install a given version of cadquery [#f1]_::
5757

5858
conda create -n cq22
5959
conda activate cq22
60-
conda install -c conda-forge cadquery=2.2.0
60+
conda install -c conda-forge cadquery=2.2.0 occt=7.7.0
6161

6262
or install the latest dev version::
6363

@@ -119,14 +119,16 @@ Jupyter
119119
Viewing models in Jupyter is another good option for a GUI. Models are rendered in the browser.
120120

121121
The cadquery library works out-of-the-box with Jupyter.
122-
First install cadquery, then install JupyterLab_ in the same conda or Python venv.::
122+
First install cadquery, then install JupyterLab_ in the same conda or Python venv.:
123123

124124
conda
125+
125126
.. code-block::
126127
127128
conda install -c conda-forge jupyterlab
128129
129130
pip
131+
130132
.. code-block::
131133
132134
pip install jupyterlab
@@ -156,4 +158,10 @@ If all has gone well, you can open a command line/prompt, and type::
156158
$ import cadquery
157159
$ cadquery.Workplane('XY').box(1,2,3).toSvg()
158160

159-
You should see raw SVG output displayed on the command line if the CadQuery installation was successful.
161+
You should see raw SVG output displayed on the command line if the CadQuery installation was successful.
162+
163+
164+
.. note::
165+
166+
.. [#f1] Installation of the latest release (version 2.2.0) with conda requires you to specify the version of the OCCT dependency.
167+
Typically this is not required as the dependencies are managed automatically.

0 commit comments

Comments
 (0)