Merge branch 'master' into merge-back-v3p0p0

SciTools · Jan 27, 2021 · 12ab1cb · 12ab1cb
2 parents 4b8df18 + e7eced5
commit 12ab1cb
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/docs/iris/src/installing.rst b/docs/iris/src/installing.rst
@@ -41,11 +41,45 @@ need the Iris sample data. This can also be installed using conda::
 Further documentation on using conda and the features it provides can be found
 at https://conda.io/en/latest/index.html.
 
+.. _installing_from_source_without_conda:
+
+Installing from source without conda on Debian-based Linux distros (devs)
+-------------------------------------------------------------------------
+
+Iris can also be installed without a conda environment. The instructions in
+this section are valid for Debian-based Linux distributions (Debian, Ubuntu,
+Kubuntu, etc.).
+
+Iris and its dependencies need some shared libraries in order to work properly.
+These can be installed
+with apt::
+
+  sudo apt-get install python3-pip python3-tk libudunits2-dev libproj-dev proj-bin libgeos-dev libcunit1-dev
+  
+Consider executing::
+
+  sudo apt-get update
+  
+before and after installation of Debian packages.
+
+The rest can be done with pip. Begin with numpy::
+
+  pip3 install numpy
+
+Finally, Iris and its Python dependencies can be installed with the following
+command::
+
+  pip3 install setuptools cftime==1.2.1 cf-units scitools-pyke scitools-iris
+
+This procedure was tested on a Ubuntu 20.04 system on the
+27th of January, 2021.
+Be aware that through updates of the involved Debian and/or Python packages,
+dependency conflicts might arise or the procedure might have to modified.
 
 .. _installing_from_source:
 
-Installing From Source (Developers)
------------------------------------
+Installing from Source with Conda (Developers)
+----------------------------------------------
 
 The latest Iris source release is available from
 https://github.com/SciTools/iris.

diff --git a/docs/iris/src/whatsnew/latest.rst b/docs/iris/src/whatsnew/latest.rst
@@ -53,6 +53,8 @@ This document explains the changes made to Iris for this release
 
 * `@rcomer`_ updated the "Seasonal ensemble model plots" Gallery example.
   (:pull:`3933`)
+* `@MHBalsmeier`_ Described non-conda installation on Debian-based distros.
+  (:pull:`3958`)
 
 
 💼 Internal
@@ -66,3 +68,4 @@ This document explains the changes made to Iris for this release
 .. _@trexfeathers: https://github.com/trexfeathers
 .. _@gcaria: https://github.com/gcaria
 .. _@rcomer: https://github.com/rcomer
+.. _@MHBalsmeier: https://github.com/MHBalsmeier