Merge remote-tracking branch 'upstream/v2.0.x' into v2.0.x_merge_back

* upstream/v2.0.x: Release of iris v2.0.0 🎉 Improved the pip installability of scitools-iris. (SciTools#2956) Add a general zenodo link to the readme. (SciTools#2955) No docs are better than wrong docs on dask DOC: lazy data docstring made clearer (SciTools#2947) Remove gdal from 'all' to 'extensions' depedency group. Tweaked what's new, bumped version string, and updated the MANIFEST for pypi.
pelson · Feb 14, 2018 · 17fe324 · 17fe324
2 parents 8a327b4 + 3c89cc0
commit 17fe324
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 44 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -6,6 +6,9 @@ recursive-include lib/iris/tests/results *.cml *.cdl *.txt *.xml *.json
 recursive-include lib/iris/etc *
 include lib/iris/fileformats/_pyke_rules/*.k?b
 include lib/iris/tests/stock*.npz
+exclude lib/iris/etc/site.cfg
+
+include requirements/*.txt
 
 # File required to build docs
 recursive-include docs Makefile *.js *.png *.py *.rst

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Iris
 
 [![Join the chat at https://gitter.im/SciTools/iris](https://badges.gitter.im/SciTools/iris.svg)](https://gitter.im/SciTools/iris?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://api.travis-ci.org/repositories/SciTools/iris.svg?branch=master)](https://travis-ci.org/SciTools/iris/branches)
-[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.51860.svg)](https://dx.doi.org/10.5281/zenodo.51860)
+[![DOI](https://zenodo.org/badge/5312648.svg)](https://zenodo.org/badge/latestdoi/5312648)
 [![Documentation for master branch ](https://img.shields.io/badge/docs-master-blue.svg)](https://scitools-docs.github.io/iris/master/index.html)
 
 (C) British Crown Copyright 2010 - 2018, Met Office

diff --git a/docs/iris/src/developers_guide/dask_interface.rst b/docs/iris/src/developers_guide/dask_interface.rst
diff --git a/docs/iris/src/developers_guide/index.rst b/docs/iris/src/developers_guide/index.rst
@@ -38,4 +38,3 @@
    tests.rst
    deprecations.rst
    release.rst
-   dask_interface.rst
diff --git a/docs/iris/src/whatsnew/2.0.rst b/docs/iris/src/whatsnew/2.0.rst
@@ -196,14 +196,15 @@ Incompatible Changes
   functionality is now delivered through :mod:`iris-grib`.
 
 * In Iris v1 it was possible to configure Iris to log at import time through
-  :attr:`iris.config.LOGGING`. This capability has been removed in iris v2.
+  `iris.config.LOGGING`. This capability has been removed in Iris v2.
 
-* When coordinates have no well defined plot axis, iris.plot and iris.quickplot
-  routines now use the order of the cube's dimensions to determine the
-  coordinates to plot as the x and y axis of a plot. 
+* When coordinates have no well defined plot axis, :mod:`iris.plot` and
+  :mod:`iris.quickplot` routines now use the order of the cube's dimensions
+  to determine the coordinates to plot as the x and y axis of a plot. 
 
-* The cf_units dependency version has been updated to v1.2.0, which prints shorter
-  unit strings.
+* The cf_units dependency version has been updated to v1.2.0, which prints
+  shorter unit strings. For example, the unit ``meter-second^-1`` is now
+  printed as ``m.s-1``.
 
 
 Deprecation removals

diff --git a/requirements/core.txt b/requirements/core.txt
@@ -7,6 +7,7 @@ cartopy
 matplotlib<1.9
 netcdf4
 numpy
+scipy
 # pyke (not pip installable)  #conda: pyke
 cf_units
 dask>=0.15.0
diff --git a/setup.py b/setup.py
@@ -245,7 +245,7 @@ def extract_version():
     zip_safe=False,
 
     setup_requires=pip_requirements('setup'),
-    install_requires=pip_requirements('core'),
+    install_requires=pip_requirements('setup') + pip_requirements('core'),
     tests_require=['{}[test]'.format(pypi_name)],
     extras_require = {
                       'test': pip_requirements('test'),