Skip to content

Commit

Permalink
Merge pull request #19 from nansencenter/issue18_upgrade_cartopy_version
Browse files Browse the repository at this point in the history
Upgrade cartopy version
  • Loading branch information
akorosov authored Jan 18, 2022
2 parents 3334e7e + 14fbecc commit e28ef8f
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 36 deletions.
22 changes: 4 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,14 @@ RUN apt-get update \
&& apt clean \
&& rm -rf /var/lib/apt/lists/*

COPY environment.yml /tmp/environment.yml

RUN conda install setuptools \
&& conda update conda \
&& conda config --add channels conda-forge \
&& conda install -y \
cartopy=0.18.0 \
coverage=5.2.1 \
coveralls=2.1.2 \
gdal=3.1.2 \
ipdb=0.13.3 \
ipython=7.17.0 \
matplotlib=3.3.1 \
mock=4.0.2 \
netcdf4=1.5.4 \
nose=1.3.7 \
numpy=1.19.1 \
pillow=7.2.0 \
python-dateutil=2.8.1 \
scipy=1.5.2 \
urllib3=1.25.10 \
&& conda env update -n base --file /tmp/environment.yml \
&& rm /tmp/environment.yml \
&& conda clean -a -y \
&& rm /opt/conda/pkgs/* -rf \
&& pip install pythesint==1.5.1 \
&& python -c 'import pythesint; pythesint.update_all_vocabularies()' \
&& wget -nc -nv -P /usr/share/MOD44W https://github.com/nansencenter/mod44w/raw/master/MOD44W.tgz \
&& tar -xzf /usr/share/MOD44W/MOD44W.tgz -C /usr/share/MOD44W/ \
Expand Down
37 changes: 19 additions & 18 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@ channels:
- conda-forge
dependencies:
- python=3.7
- setuptools
- cartopy=0.18.0
- coverage=5.2.1
- coveralls=2.1.2
- gdal=3.1.2
- ipdb=0.13.3
- ipython=7.17.0
- matplotlib=3.3.1
- mock=4.0.2
- netcdf4=1.5.4
- nose=1.3.7
- numpy=1.19.1
- pillow=7.2.0
- pip
- python-dateutil=2.8.1
- scipy=1.5.2
- urllib3=1.25.10
- setuptools=60.1
- cartopy=0.20.1
- coverage=6.2
- coveralls=3.3
- gdal=3.4
- ipdb=0.13
- ipython=7.30
- matplotlib=3.5
- mock=4.0
- netcdf4=1.5
- nose=1.3
- numpy=1.21
- pillow=8.4
- pip=21
- python-dateutil=2.8
- PyYAML<6.0
- scipy=1.7
- urllib3=1.26
- pip:
- pythesint==1.5.1
- pythesint==1.6.1

0 comments on commit e28ef8f

Please sign in to comment.