From 606f9c790546219e505c2295db67e48e131cdba0 Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Thu, 11 Jan 2018 15:18:00 +0000 Subject: [PATCH 1/2] Converted the contributions into the whatsnew. --- docs/iris/src/whatsnew/2.0.rst | 12 ++++++++++++ .../incompatiblechange_2017-Oct-27_grib_removed.txt | 1 - ...ncompatiblechange_2017-Oct-27_logging_removed.txt | 1 - ...patiblechange_2017-Oct-30_axis_order_plotting.txt | 1 - ...mpatiblechange_2018-Jan-11_short-unit-strings.txt | 2 -- 5 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-27_grib_removed.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-27_logging_removed.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-30_axis_order_plotting.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2018-Jan-11_short-unit-strings.txt diff --git a/docs/iris/src/whatsnew/2.0.rst b/docs/iris/src/whatsnew/2.0.rst index 02dccc9209..42a39057a7 100644 --- a/docs/iris/src/whatsnew/2.0.rst +++ b/docs/iris/src/whatsnew/2.0.rst @@ -192,6 +192,18 @@ Incompatible Changes * If the `packing` argument to `iris.save` is a dictionary, an error is raised if it contains any keys other than 'dtype', 'scale_factor' and 'add_offset'. +* The deprecated :mod:`iris.fileformats.grib` was removed. All Iris GRIB + 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. + +* 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. + +* The cf_units dependency version has been updated to v1.2.0, which prints shorter + unit strings. Deprecation removals diff --git a/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-27_grib_removed.txt b/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-27_grib_removed.txt deleted file mode 100644 index b5244a1414..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-27_grib_removed.txt +++ /dev/null @@ -1 +0,0 @@ -* The deprecated :mod:`iris.fileformats.grib` was removed. All Iris GRIB functionality is now delivered through :mod:`iris-grib`. diff --git a/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-27_logging_removed.txt b/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-27_logging_removed.txt deleted file mode 100644 index c4fd3370f4..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-27_logging_removed.txt +++ /dev/null @@ -1 +0,0 @@ -* 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. diff --git a/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-30_axis_order_plotting.txt b/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-30_axis_order_plotting.txt deleted file mode 100644 index 39f568ec6d..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2017-Oct-30_axis_order_plotting.txt +++ /dev/null @@ -1 +0,0 @@ -* 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. diff --git a/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2018-Jan-11_short-unit-strings.txt b/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2018-Jan-11_short-unit-strings.txt deleted file mode 100644 index ee622c28f2..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.0/incompatiblechange_2018-Jan-11_short-unit-strings.txt +++ /dev/null @@ -1,2 +0,0 @@ -* 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``. \ No newline at end of file From b1bf14a210b8d7db988c87366f3f3f09f0e80550 Mon Sep 17 00:00:00 2001 From: Phil Elson Date: Thu, 11 Jan 2018 15:21:45 +0000 Subject: [PATCH 2/2] Updated to a dev version string. --- lib/iris/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iris/__init__.py b/lib/iris/__init__.py index f45ca080c4..444dc8e0e7 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.1.0dev1' # Restrict the names imported when using "from iris import *" __all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',