Skip to content

Commit

Permalink
Prepare master for v2.0.x branch (#2934)
Browse files Browse the repository at this point in the history
  • Loading branch information
pelson authored Jan 11, 2018
1 parent 4e26b62 commit e2e2898
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Iris
[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.51860.svg)](https://dx.doi.org/10.5281/zenodo.51860)
[![Documentation for master branch ](https://img.shields.io/badge/docs-master-blue.svg)](https://scitools-docs.github.io/iris/master/index.html)

(C) British Crown Copyright 2010 - 2017, Met Office
(C) British Crown Copyright 2010 - 2018, Met Office

Iris is a powerful, easy to use, community-driven Python library for
analysing and visualising meteorological and oceanographic data sets.
Expand Down Expand Up @@ -53,7 +53,7 @@ There is also a documentation build for the latest code in the main GitHub repos
Copyright and licence
---------------------

(C) British Crown Copyright 2010 - 2017, Met Office
(C) British Crown Copyright 2010 - 2018, Met Office

This file is part of Iris.

Expand Down
2 changes: 1 addition & 1 deletion docs/iris/src/whatsnew/2.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ What's New in Iris 2.0.0
************************

:Release: 2.0.0rc1
:Date: 2017-10-30
:Date: 2018-01-11


This document explains the new/changed features of Iris in version 2.0.0
Expand Down
4 changes: 2 additions & 2 deletions lib/iris/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2010 - 2017, Met Office
# (C) British Crown Copyright 2010 - 2018, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -121,7 +121,7 @@ def callback(cube, field, filename):


# Iris revision.
__version__ = '2.1.0.dev0'
__version__ = '2.0.0rc1'

# Restrict the names imported when using "from iris import *"
__all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',
Expand Down

0 comments on commit e2e2898

Please sign in to comment.