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

picking up latest vtk-cdat from @danlipsa channel #385

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

picking up latest vtk-cdat from @danlipsa channel #385

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
364007b
picking up latest vtk-cdat from @danlipsa channel
doutriaux1 Feb 1, 2019
cc50ec2
no more post linkage to test dan stuff
doutriaux1 Feb 1, 2019
3a033b4
ok getting rid of custom channel from dan
doutriaux1 Feb 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -152,13 +151,11 @@ jobs:
OS: "osx-64"
PY_VER: "py3"
TEMP_PKGS: "'ffmpeg>4' 'libpng>1.6.34'"
CUSTOM_CHANNELS: "-c danlipsa"
steps:
- checkout
- run: *setup_miniconda
- run: *get_testdata
- run: *create_conda_env
- run: *templink
- run: *setup_vcs
- run: *run_vcs_tests
- store_artifacts:
Expand Down