Merge branch 'develop' into 'master' (0b03330a) · Commits · python / conda_environments

.gitlab-ci.yml

+2 −2

Original line number	Diff line number	Diff line
		image: continuumio/miniconda3:latest
		image: continuumio/miniconda3:4.3.27

		variables:
		DOCKER_DRIVER: overlay
		@@ -9,4 +9,4 @@ test:
		- source activate root
		- target_dir=${CONDA_PREFIX}
		- shopt -s extglob
		- ./update_anaconda.sh ${target_dir} envs/!(monitoring_gallery).yml
		- ./update_anaconda.sh ${target_dir} envs/!(*@(monitoring_gallery\|py2_parcels)).yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,6 @@ dependencies:
		- numpy
		- pandas
		- seaborn
		- xarray
		- pip:
		- "git+https://github.com/willirath/xarray.git@6f5e30f3a2f8ca907f0fd91bcd571e7d98027896#egg=xarray_wrath_allow_ploting_datetime"
		- "git+{git_protocol}git.geomar.de/open-source/cartopy_offlinedata.git@master"

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		name: py2_parcels
		channels:
		- {conda-forge}
		- {anaconda}
		dependencies:
		- python=2.7
		- cachetools>=1.0.0
		- cgen
		- enum34
		- ffmpeg
		- flake8>=2.1.0
		- gcc
		- jupyter
		- matplotlib=2.0.2
		- netcdf4>=1.1.9
		- numpy>=1.9.1
		- progressbar2
		- py>=1.4.27
		- pymbolic
		- python-dateutil
		- scipy>=0.16.0
		- six>=1.10.0
		- xarray>=0.5.1
		- pip:
		- pytest-ipynb
		- pytest>=2.7.0
		- "git+https://github.com/OceanParcels/parcels.git@master"

deleted100644 → 0

+0 −39

Original line number	Diff line number	Diff line
		name: py2_pyngl
		channels:
		- {conda-forge}
		- {willirath}
		- {anaconda}
		dependencies:
		- python=2.7
		- anaconda-client
		- aospy
		- basemap
		- cartopy
		- cf_units
		- cmocean
		- dask
		- eofs
		- fortran-magic
		- git
		- git-lfs
		- gsw
		- haversine
		- hdf5
		- ipython
		- jupyter
		- line_profiler
		- matplotlib
		- mtspec
		- nco
		- netCDF4=1.2.8
		- numpy
		- pandas
		- pyngl
		- pynio
		- pytables
		- seaborn
		- seawater
		- xarray
		- pip:
		- pymatlab
		- "git+{git_protocol}git.geomar.de/open-source/cartopy_offlinedata.git@master"

+1 −0