Skip to content
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

Jump to bottom

Merge v2.0.x into master #2957

Merged
merged 9 commits into from
Feb 14, 2018
Merged

Merge v2.0.x into master #2957

merged 9 commits into from
Feb 14, 2018

Commits on Jan 12, 2018

  1. Tweaked what's new, bumped version string, and updated the MANIFEST f… 

    …or pypi.
    @pelson
    pelson committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    6aadcf9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request SciTools#2938 from pelson/v2.0_doc_changes 

    Tweaked what's new, bumped version string, and updated the MANIFEST for pypi
    @DPeterK
    DPeterK authored Jan 12, 2018
    Configuration menu
    Copy the full SHA
    3570c95 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2018

  1. Remove gdal from 'all' to 'extensions' depedency group.

    @pp-mo @pelson
    pp-mo authored and pelson committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    7e7bfab View commit details
    Browse the repository at this point in the history

  2. DOC: lazy data docstring made clearer (SciTools#2947) 

    * DOC: lazy data docstring made clearer

* Clarify "view"
    @DPeterK @pelson
    DPeterK authored and pelson committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    33497e9 View commit details
    Browse the repository at this point in the history

  3. No docs are better than wrong docs on dask

    @DPeterK @pelson
    DPeterK authored and pelson committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    88d1a90 View commit details
    Browse the repository at this point in the history

  4. Add a general zenodo link to the readme. (SciTools#2955)

    @pelson
    pelson authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    92b8670 View commit details
    Browse the repository at this point in the history

  5. Improved the pip installability of scitools-iris. (SciTools#2956)

    @pelson
    pelson authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    4423598 View commit details
    Browse the repository at this point in the history

  6. Release of iris v2.0.0 🎉

    @pelson
    pelson committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    3c89cc0 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/v2.0.x' into v2.0.x_merge_back 

    * upstream/v2.0.x:
  Release of iris v2.0.0 🎉
  Improved the pip installability of scitools-iris. (SciTools#2956)
  Add a general zenodo link to the readme. (SciTools#2955)
  No docs are better than wrong docs on dask
  DOC: lazy data docstring made clearer (SciTools#2947)
  Remove gdal from 'all' to 'extensions' depedency group.
  Tweaked what's new, bumped version string, and updated the MANIFEST for pypi.
    @pelson
    pelson committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    17fe324 View commit details
    Browse the repository at this point in the history