From 364007bc35b1a32c69ba43d2310cde985f35ffb3 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Fri, 1 Feb 2019 15:18:28 -0800 Subject: [PATCH 1/3] picking up latest vtk-cdat from @danlipsa channel --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d1f34019..44bcfb0da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ aliases: name: create_conda_env environment: CHANNELS: "-c cdat/label/nightly -c conda-forge -c cdat" - PKGS: "cdms2 cdat_info udunits2 testsrunner mesalib matplotlib image-compare genutil dv3d cdutil cdtime nbformat 'vtk-cdat<8.2.0.rc2.289.8.0.2019.01.28.16' 'proj4<5' 'numpy>1.14' ghostscript" + PKGS: "cdms2 cdat_info udunits2 testsrunner mesalib matplotlib image-compare genutil dv3d cdutil cdtime nbformat vtk-cdat 'proj4<5' 'numpy>1.14' ghostscript" command: | export PATH=$WORKDIR/miniconda/bin:$PATH conda config --set always_yes yes --set changeps1 no From cc50ec2d110d03c318a186048cb067fdbdcacf68 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Fri, 1 Feb 2019 15:51:07 -0800 Subject: [PATCH 2/3] no more post linkage to test dan stuff --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 44bcfb0da..8d181d80b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -158,7 +158,6 @@ jobs: - run: *setup_miniconda - run: *get_testdata - run: *create_conda_env - - run: *templink - run: *setup_vcs - run: *run_vcs_tests - store_artifacts: From 3a033b42d450b71498670040a4fa5f9842302611 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Mon, 4 Feb 2019 10:26:04 -0800 Subject: [PATCH 3/3] ok getting rid of custom channel from dan --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d181d80b..114ca4d6d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,7 +129,6 @@ jobs: OS: "osx-64" PY_VER: "py2" TEMP_PKGS: "'ffmpeg>4' 'libpng>1.6.34'" - CUSTOM_CHANNELS: "-c danlipsa" steps: - checkout - run: *setup_miniconda @@ -152,7 +151,6 @@ jobs: OS: "osx-64" PY_VER: "py3" TEMP_PKGS: "'ffmpeg>4' 'libpng>1.6.34'" - CUSTOM_CHANNELS: "-c danlipsa" steps: - checkout - run: *setup_miniconda