From fbda4d9d4af8ed3ddaa47a4db85d43497b8db408 Mon Sep 17 00:00:00 2001 From: Nikita Gazarov Date: Thu, 28 Oct 2021 21:29:59 -0700 Subject: [PATCH 1/2] Clarify about conda environments This PR is clarifying that the installation instructions are talking about conda environments and not python environments. I'm new to all this so not 100% sure that this is the right thing to say, but it seemed to work for me. --- doc/installation.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/installation.rst b/doc/installation.rst index 7db3c5b39..2189bf822 100644 --- a/doc/installation.rst +++ b/doc/installation.rst @@ -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 From 9ea6dab7dba97d7d7bf78ece3bd8fa0a71a9010b Mon Sep 17 00:00:00 2001 From: AU Date: Thu, 25 Nov 2021 07:30:33 +0100 Subject: [PATCH 2/2] Use conda-build 3.21.6 --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 364202291..c8134227b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,7 @@ 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: @@ -29,7 +29,7 @@ jobs: 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: @@ -37,7 +37,7 @@ jobs: 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: @@ -45,7 +45,7 @@ jobs: 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: @@ -53,7 +53,7 @@ jobs: 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: @@ -61,4 +61,4 @@ jobs: vmImage: 'vs2017-win2016' py_maj: 3 py_min: 9 - conda_bld: 3.21.4 + conda_bld: 3.21.6