Commits · cdad41f74859da5da2043a3cd92f7e4e1e4f0d46 · python / conda_environments

31 Jan, 2018 4 commits
- 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 8 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
- Restore matplotlib inclusion · 63110b3c
  Willi Rath authored Nov 01, 2017
  
  63110b3c
- Use parcesl@master and install gcc · 598d5650
  Willi Rath authored Nov 01, 2017
  
  598d5650
- Make sure that parcels has a matplotlib · f6478ece
  Willi Rath authored Nov 01, 2017
  
  f6478ece
- Always use https for git clone · 23e2fdff
  Willi Rath authored Nov 01, 2017
  
  23e2fdff
- Use pip for pytest-packages · df66ae07
  Willi Rath authored Nov 01, 2017
  
  df66ae07
- Add untested parcels env · a4c6c214
  Willi Rath authored Nov 01, 2017
  
  a4c6c214
02 Oct, 2017 9 commits
- Merge branch 'master' into 'develop' · 22529340
  Willi Rath authored Oct 02, 2017
```
Master

See merge request !61
```
  22529340
- Merge branch 'develop' into 'master' · 54180489
  Willi Rath authored Oct 02, 2017
```
Develop

See merge request !60
```
  54180489
- Merge branch 'unpin-py2712' into develop · 6743d9ad
  Willi Rath authored Oct 02, 2017
  
  6743d9ad
- Merge branch 'add-git-and-git-lfs' into develop · e2c9eb0f
  Willi Rath authored Oct 02, 2017
  
  e2c9eb0f
- Un-pin matplotlib · 788cb2a0
  Willi Rath authored Oct 02, 2017
  
  788cb2a0
- Un-pin matplotlib and add pynio to pyngl env · 944ffe17
  Willi Rath authored Oct 02, 2017
  
  944ffe17
- Add x264 packages · 3231e742
  Willi Rath authored Oct 02, 2017
  
  3231e742
- Add git and git-lfs wherever it makes sense · 1e79a62a
  Willi Rath authored Oct 02, 2017
  
  1e79a62a
- Un-pin py2.7.12 everywhere · e089cef2
  Willi Rath authored Oct 02, 2017
  
  e089cef2
21 Sep, 2017 3 commits

Merge branch 'develop' into 'master' · 0fdfab30
Willi Rath authored Sep 21, 2017
```
Pin nc4

See merge request !59
```
0fdfab30
Merge branch '23-pin-nc-128-everywhere' into 'develop' · 43f97e59
Willi Rath authored Sep 21, 2017
```
Pin netCDF4 to v1.2.8 everywhere

See merge request !58
```
43f97e59

Pin netCDF4 to v1.2.8 everywhere · 01c87327

Willi Rath authored Sep 21, 2017

v1.2.9 honors `valid_min` and `valid_max` to mask data.  This messes up
working with data that did a sloppy job in maintaining these valid
ranges.  To learn about progress, follow:

- <https://github.com/Unidata/netcdf4-python/issues/711>
- <https://github.com/Unidata/netcdf4-python/issues/703>

01c87327

19 Sep, 2017 2 commits
- Merge branch 'develop' into 'master' · 2f3016a4
  Willi Rath authored Sep 19, 2017
```
Develop

See merge request !57
```
  2f3016a4
- Merge branch '22-pin-netcdf-monitoring' into 'develop' · 2f14d4a5
  Willi Rath authored Sep 19, 2017
```
Pin netCDF4 to 1.2.8

See merge request !56
```
  2f14d4a5