Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clarify installation steps (conda environments) #908

Merged
merged 2 commits into from
Nov 25, 2021
Merged

Clarify installation steps (conda environments) #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbda4d9
Clarify about conda environments
raquo Oct 29, 2021
9ea6dab
Use conda-build 3.21.6
adam-urbanczyk Nov 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,44 +21,44 @@ jobs:
vmImage: 'ubuntu-18.04'
py_maj: 3
py_min: 8
conda_bld: 3.19.2
conda_bld: 3.21.6

- template: conda-build.yml@templates
parameters:
name: macOS_38
vmImage: 'macOS-10.15'
py_maj: 3
py_min: 8
conda_bld: 3.19.2
conda_bld: 3.21.6

- template: conda-build.yml@templates
parameters:
name: Windows_38
vmImage: 'vs2017-win2016'
py_maj: 3
py_min: 8
conda_bld: 3.19.2
conda_bld: 3.21.6

- template: conda-build.yml@templates
parameters:
name: Linux_39
vmImage: 'ubuntu-18.04'
py_maj: 3
py_min: 9
conda_bld: 3.21.4
conda_bld: 3.21.6

- template: conda-build.yml@templates
parameters:
name: macOS_39
vmImage: 'macOS-10.15'
py_maj: 3
py_min: 9
conda_bld: 3.21.4
conda_bld: 3.21.6

- template: conda-build.yml@templates
parameters:
name: Windows_39
vmImage: 'vs2017-win2016'
py_maj: 3
py_min: 9
conda_bld: 3.21.4
conda_bld: 3.21.6
4 changes: 2 additions & 2 deletions doc/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ Command Line Installation

CadQuery development moves very quickly, so you will need to choose whether you want the latest features or an older, probably more stable, version of CadQuery.

To get the latest features (recommended), once you have Anaconda or Miniconda installed, activate the environment you want to use and type::
To get the latest features (recommended), once you have Anaconda or Miniconda installed, activate the [conda environment](https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html) you want to use and type::

conda install -c cadquery -c conda-forge cadquery=master

If you want an older, more stable version of CadQuery, once you have Anaconda or Miniconda installed, activate the environment you want to use and type::
If you want an older, more stable version of CadQuery, once you have Anaconda or Miniconda installed, activate the [conda environment](https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html) you want to use and type::

conda install -c conda-forge -c cadquery cadquery=2

Expand Down