diff --git a/.travis.yml b/.travis.yml index b155449fc2..fac3f49c10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,7 @@ install: # install deps - ./.travis_no_output sudo apt-get install python-scipy cython python-pip + - ./.travis_no_output sudo /usr/bin/pip install numpy==1.7.2 - ./.travis_no_output sudo /usr/bin/pip install --use-mirrors shapely nose - ./.travis_no_output sudo /usr/bin/pip install --use-mirrors pyshp pep8 mock - ./.travis_no_output sudo /usr/bin/pip install --use-mirrors setuptools diff --git a/docs/iris/src/whatsnew/1.5.rst b/docs/iris/src/whatsnew/1.5.rst index 5ef0348557..dfdb3982d6 100644 --- a/docs/iris/src/whatsnew/1.5.rst +++ b/docs/iris/src/whatsnew/1.5.rst @@ -118,8 +118,8 @@ Bugs fixed * OSGB definition corrected. * Transverse Mercator on load now accepts the following interchangeably due to inconsistencies in CF documentation: - * +scale_factor_at_central_meridian <-> scale_factor_at_projection_origin - * +longitude_of_central_meridian <-> longitude_of_projection_origin + * +scale_factor_at_central_meridian <-> scale_factor_at_projection_origin + * +longitude_of_central_meridian <-> longitude_of_projection_origin (+recommended encoding) * Ellipse description now maintained when converting GeogCS to cartopy. * GeoTIFF export bug fixes. diff --git a/lib/iris/fileformats/_ff_cross_references.py b/lib/iris/fileformats/_ff_cross_references.py index d3bc8916e4..9080df4653 100644 --- a/lib/iris/fileformats/_ff_cross_references.py +++ b/lib/iris/fileformats/_ff_cross_references.py @@ -5168,4 +5168,4 @@ "m04s06i035": Stash(60, 401), "m04s07i001": Stash(60, 358), "m04s07i002": Stash(60, 359), - } +} diff --git a/lib/iris/unit.py b/lib/iris/unit.py index 3c590e488f..0b8b358e34 100644 --- a/lib/iris/unit.py +++ b/lib/iris/unit.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2013, Met Office +# (C) British Crown Copyright 2010 - 2014, Met Office # # This file is part of Iris. # @@ -675,7 +675,8 @@ def num2date(time_value, unit, calendar): datetime.datetime(1970, 1, 1, 6, 0) >>> unit.num2date([6, 7], 'hours since 1970-01-01 00:00:00', ... unit.CALENDAR_STANDARD) - array([1970-01-01 06:00:00, 1970-01-01 07:00:00], dtype=object) + array([datetime.datetime(1970, 1, 1, 6, 0), + datetime.datetime(1970, 1, 1, 7, 0)], dtype=object) """ @@ -1959,7 +1960,8 @@ def num2date(self, time_value): >>> u.num2date(6) datetime.datetime(1970, 1, 1, 6, 0) >>> u.num2date([6, 7]) - array([1970-01-01 06:00:00, 1970-01-01 07:00:00], dtype=object) + array([datetime.datetime(1970, 1, 1, 6, 0), + datetime.datetime(1970, 1, 1, 7, 0)], dtype=object) """ cdf_utime = self.utime()