Skip to content

BLD: Updated numpy to 1.7.2 #975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjlittle merged 1 commit into from
Jan 23, 2014
Merged

BLD: Updated numpy to 1.7.2 #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/iris/src/whatsnew/1.5.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/_ff_cross_references.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5168,4 +5168,4 @@
"m04s06i035": Stash(60, 401),
"m04s07i001": Stash(60, 358),
"m04s07i002": Stash(60, 359),
}
}
Copy link
Member

@bjlittle bjlittle Jan 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tsk tsk ... @cpelley I assume you're going to push the change into code-generators?

Copy link
Author

@cpelley cpelley Jan 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:)
https://github.com/SciTools/iris-code-generators/pull/33
I have done a diff between the one generated and the one that is in this PR, and they are identical.

8 changes: 5 additions & 3 deletions lib/iris/unit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down Expand Up @@ -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)

"""

Expand Down Expand Up @@ -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()
Expand Down