Skip to content

Tweaked what's new, bumped version string, and updated the MANIFEST for pypi #2938

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
merged 1 commit into from
Jan 12, 2018
Merged

Tweaked what's new, bumped version string, and updated the MANIFEST for pypi #2938

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
3 changes: 3 additions & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions docs/iris/src/whatsnew/2.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down