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

forcing 3.6 python #24

Merged
merged 2 commits into from
Feb 27, 2019
Merged

forcing 3.6 python #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ee878a
forcing 3.6 python
doutriaux1 Feb 26, 2019
af12e0d
looks like merge conflicts were stuk in here
doutriaux1 Feb 26, 2019
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
4 changes: 2 additions & 2 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 matplotlib numpy=1.14 genutil 'vtk-cdat>8.1' cdutil vcs "proj4<5" mesalib
PKGS: cdms2 cdat_info udunits2 testsrunner matplotlib numpy genutil vtk-cdat cdutil vcs "proj4<5" mesalib
command: |
export PATH=$WORKDIR/miniconda/bin:$PATH
conda config --set always_yes yes --set changeps1 no
Expand All @@ -31,7 +31,7 @@ aliases:
if [[ $PY_VER = "py2" ]]; then
conda create -q -n $PY_VER $CHANNELS $PKGS $TEMP_PKGS "python<3"
else
conda create -q -n $PY_VER $CHANNELS $PKGS $TEMP_PKGS "python>3" nbsphinx easydev $COVERAGE_PKGS
conda create -q -n $PY_VER $CHANNELS $PKGS $TEMP_PKGS "python=3.6" nbsphinx easydev $COVERAGE_PKGS
fi
rm -rf $WORKDIR/miniconda/envs/$PY_VER/lib/python?.?/site-packages/DV3D*

Expand Down