Commits · master · python / conda_environments

12 Jun, 2018 7 commits
- Merge branch 'add-cftime' into 'master' · 14e8b56e
  Willi Rath authored Jun 12, 2018
```
Add cftime

See merge request !76
```
  14e8b56e
- Merge branch 'upgrade-miniconda-in-ci' into 'master' · 60413763
  Willi Rath authored Jun 12, 2018
```
Upgrade miniconda image used for the tests

See merge request !75
```
  60413763
- Add cftime · 28df9b13
  Willi Rath authored Jun 12, 2018
  
  28df9b13
- Switch to online repos at HLRN · fb5c0d94
  Willi Rath authored Jun 12, 2018
  
  fb5c0d94
- Be more verbose when updating · bfccb46c
  Willi Rath authored Jun 12, 2018
  
  bfccb46c
- Be more verbose when installing · 343367ea
  Willi Rath authored Jun 12, 2018
  
  343367ea
- Upgrade miniconda image used for the tests · bff84c7d
  Willi Rath authored Jun 12, 2018
  
  bff84c7d
08 May, 2018 3 commits
- Merge branch 'develop' into 'master' · 2f3b13ab
  Willi Rath authored May 08, 2018
```
Develop

See merge request !74
```
  2f3b13ab
- Merge branch '31-add-sklearn-to-standard-environments' into 'develop' · 39aa4231
  Willi Rath authored May 08, 2018
```
Resolve "Add sklearn to standard environments"

See merge request !73
```
  39aa4231
- Add sklearn and dask distributed · 1d1de307
  Willi Rath authored May 08, 2018
  
  1d1de307
14 Mar, 2018 3 commits
- Merge branch 'master' into 'develop' · 3e44f5e5
  Willi Rath authored Mar 14, 2018
```
Master

See merge request !72
```
  3e44f5e5
- Merge branch '29-pin-cdo' into 'master' · 704b0e76
  Willi Rath authored Mar 14, 2018
```
Resolve "Pin CDO to 1.8"

Closes #29

See merge request !71
```
  704b0e76
- Pin cdo to keep compatible w/ pinned netCDF4 · 46419e18
  Willi Rath authored Mar 14, 2018
  
  46419e18
13 Feb, 2018 2 commits
- Merge branch 'develop' into 'master' · 5e457671
  Willi Rath authored Feb 13, 2018
```
Use curl because wget might not be available on Mac

See merge request !70
```
  5e457671
- Use curl because wget might not be available on Mac · 47ae49a6
  Willi Rath authored Feb 13, 2018
  
  47ae49a6
31 Jan, 2018 9 commits
- Merge branch 'develop' into 'master' · 3430aed4
  Willi Rath authored Jan 31, 2018
```
Develop

See merge request !69
```
  3430aed4
- Merge branch 'develop' of git.geomar.de:python/conda_environments into develop · 6bb3154b
  Willi Rath authored Jan 31, 2018
  
  6bb3154b
- Include git to prevent ssl failures on pip git+https · 31063fba
  Willi Rath authored Jan 31, 2018
  
  31063fba
- Merge branch 'develop' into 'master' · 9ab15467
  Willi Rath authored Jan 31, 2018
```
Pin widgetsnbextension

See merge request !68
```
  9ab15467
- Pin widgetsnbextension · cf409115
  Willi Rath authored Jan 31, 2018
  
  cf409115
- Merge branch 'develop' into 'master' · cdad41f7
  Willi Rath authored Jan 31, 2018
```
Add conda-mirror

See merge request !67
```
  cdad41f7
- Add conda-mirror · 321982f2
  Willi Rath authored Jan 31, 2018
  
  321982f2
- Merge branch 'develop' into 'master' · cbc492dd
  Willi Rath authored Jan 31, 2018
```
Use Parcels v1.0 conda-forge package

See merge request !66
```
  cbc492dd
- Use Parcels v1.0 conda-forge package · b3322dd7
  Willi Rath authored Jan 31, 2018
  
  b3322dd7
17 Jan, 2018 2 commits
- Merge branch 'develop' into 'master' · 83928a41
  Willi Rath authored Jan 17, 2018
```
Detail the interplay between latest and previous

See merge request !65
```
  83928a41
- Detail the interplay between latest and previous · 9c41d416
  Willi Rath authored Jan 17, 2018
  
  9c41d416
09 Jan, 2018 6 commits
- Merge branch 'develop' into 'master' · 0b03330a
  Willi Rath authored Jan 09, 2018
```
Develop

See merge request !64
```
  0b03330a
- Merge branch 'master' into develop · 54fb092e
  Willi Rath authored Jan 09, 2018
  
  54fb092e
- Merge branch 'add-parcels-env' into 'develop' · 0616a687
  Willi Rath authored Jan 09, 2018
```
Add parcels env

See merge request !63
```
  0616a687
- Remove py2_pyngl env (for now) · d24a7073
  Willi Rath authored Jan 09, 2018
  
  d24a7073
- Add memory profiler · a4d2c4e4
  Willi Rath authored Jan 09, 2018
  
  a4d2c4e4
- Use xarray v0.10 · 93157851
  Willi Rath authored Jan 09, 2018
  
  93157851
18 Dec, 2017 2 commits
- Exclude Parcels env from test · 6f79c412
  Willi Rath authored Dec 18, 2017
```
That's quite an ugly hack ...
```
  6f79c412
- Pin miniconda image · d9ac8752
  Willi Rath authored Dec 18, 2017
  
  d9ac8752
06 Nov, 2017 4 commits
- Merge branch '25-add-gsw-package' into 'master' · 1ac1ae7e
  Willi Rath authored Nov 06, 2017
```
Add gsw package

See merge request !62
```
  1ac1ae7e
- Install gsw from conda-forge for Py2 as well · a4d94b60
  Willi Rath authored Nov 06, 2017
  
  a4d94b60
- Pin gsw==3.0.6 for Python 2 · a657533e
  Willi Rath authored Nov 06, 2017
  
  a657533e
- Add gsw modules · 5b07e155
  Willi Rath authored Nov 06, 2017
```
- For Python 3, use conda-forge's gsw package which is
  <https://github.com/TEOS-10/GSW-Python>.
- For Python 2, install the deprecated version with pip.
```
  5b07e155
01 Nov, 2017 2 commits
- Pin matplotlib b/c of known bug w miss import · 85311f74
  Willi Rath authored Nov 01, 2017
  
  85311f74
- Include ffmpeg · 4d6df97d
  Willi Rath authored Nov 01, 2017
  
  4d6df97d