diff --git a/MANIFEST.in b/MANIFEST.in index ff8e330fd5..ea5744519a 100644 --- 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/docs/iris/src/whatsnew/2.0.rst b/docs/iris/src/whatsnew/2.0.rst index 42a39057a7..c5c1af54c8 100644 --- 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/lib/iris/__init__.py b/lib/iris/__init__.py index f45ca080c4..e7685764aa 100644 --- a/lib/iris/__init__.py +++ b/lib/iris/__init__.py @@ -121,7 +121,7 @@ def callback(cube, field, filename): # Iris revision. -__version__ = '2.0.0rc1' +__version__ = '2.0.0rc2.dev0' # Restrict the names imported when using "from iris import *" __all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',