Commit 3430aed4 authored by Willi Rath's avatar Willi Rath

Merge branch 'develop' into 'master'

Develop

See merge request !69
parents 9ab15467 6bb3154b
Pipeline #1318 passed with stage
in 23 minutes and 29 seconds
......@@ -11,6 +11,7 @@ dependencies:
- cf_units
- cmocean
- dask
- git
- ipython
- jupyter
- matplotlib=1.5.3
......
......@@ -5,6 +5,7 @@ channels:
dependencies:
- python=2.7
- anaconda-client
- git
- ConfigParser
- ffmpeg
- pip:
......
......@@ -11,6 +11,7 @@ dependencies:
- cf_units
- cmocean
- dask
- git
- ipython
- jupyter
- matplotlib=1.5.3
......
......@@ -5,6 +5,7 @@ channels:
dependencies:
- python=2.7
- anaconda-client
- git
- ConfigParser
- ffmpeg
- pip:
......
......@@ -11,6 +11,7 @@ dependencies:
- cf_units
- cmocean
- dask
- git
- ipython
- jupyter
- matplotlib=1.5.3
......
......@@ -5,6 +5,7 @@ channels:
dependencies:
- python=2.7
- anaconda-client
- git
- ConfigParser
- ffmpeg
- pip:
......
......@@ -11,6 +11,7 @@ dependencies:
- cf_units
- cmocean
- dask
- git
- ipython
- jupyter
- matplotlib=1.5.3
......
......@@ -5,6 +5,7 @@ channels:
dependencies:
- python=2.7
- anaconda-client
- git
- ConfigParser
- ffmpeg
- pip:
......
......@@ -11,6 +11,7 @@ dependencies:
- cf_units
- cmocean
- dask
- git
- ipython
- jupyter
- matplotlib=1.5.3
......
......@@ -5,6 +5,7 @@ channels:
dependencies:
- python=2.7
- anaconda-client
- git
- ConfigParser
- ffmpeg
- pip:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment