From 6344eecd1f737d191b7e4330b3eb31561446420e Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 27 Jun 2017 08:33:12 -0400 Subject: Force conda to selected version of python --- jenkins/dispatch.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 1d42053..41eab8b 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -159,10 +159,10 @@ node(LABEL) { // Install specific versions of miniconda and conda-build sh "bash ./${conda_installer} -b -p miniconda" env.PATH = "${env.WORKSPACE}/miniconda/bin:${env.PATH}" - sh "conda install --quiet conda=${CONDA_VERSION}" + sh "conda install --quiet conda=${CONDA_VERSION} python=${PY_VERSION}" sh "conda install --quiet --yes conda-build=${CONDA_BUILD_VERSION}" - // Apply bugfix patch to conda_build 2.1.1 + // Apply bugfix patch to conda_build 2.1.1 - 2.1.15 - (?) def filename = "${env.WORKSPACE}/miniconda/lib/python${PY_VERSION}/" + "site-packages/conda_build/config.py" def patches_dir = "${env.WORKSPACE}/patches" -- cgit From a932710d21554509e6ff09303366905a0b010e74 Mon Sep 17 00:00:00 2001 From: Matt Rendina Date: Tue, 27 Jun 2017 09:02:48 -0400 Subject: Consolidate conda version adjustment and package installation to one operation --- jenkins/dispatch.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/dispatch.groovy b/jenkins/dispatch.groovy index 41eab8b..f3168c6 100644 --- a/jenkins/dispatch.groovy +++ b/jenkins/dispatch.groovy @@ -159,8 +159,8 @@ node(LABEL) { // Install specific versions of miniconda and conda-build sh "bash ./${conda_installer} -b -p miniconda" env.PATH = "${env.WORKSPACE}/miniconda/bin:${env.PATH}" - sh "conda install --quiet conda=${CONDA_VERSION} python=${PY_VERSION}" - sh "conda install --quiet --yes conda-build=${CONDA_BUILD_VERSION}" + def cpkgs = "conda=${CONDA_VERSION} conda-build=${CONDA_BUILD_VERSION}" + sh "conda install --quiet --yes ${cpkgs} python=${PY_VERSION}" // Apply bugfix patch to conda_build 2.1.1 - 2.1.15 - (?) def filename = "${env.WORKSPACE}/miniconda/lib/python${PY_VERSION}/" + -- cgit