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

Fix test failures / warnings for pandas 0.24 #2720

Merged
merged 3 commits into from
Jan 27, 2019
Merged

Fix test failures / warnings for pandas 0.24 #2720

merged 3 commits into from
Jan 27, 2019

Conversation

shoyer
Copy link
Member

@shoyer shoyer commented Jan 27, 2019 •
edited
Loading

@spencerkclark spencerkclark mentioned this pull request Jan 27, 2019
Merged
3 tasks
jhamman
jhamman approved these changes Jan 27, 2019
View reviewed changes
Copy link
Member

@jhamman jhamman left a comment

Choose a reason for hiding this comment

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

LGTM. Just needs a whats new entry.

xarray/core/coordinates.py
@@ -1,4 +1,5 @@
from collections import Mapping, OrderedDict
Copy link
Member

Choose a reason for hiding this comment

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

thanks for catching this.

xarray/tests/test_dataarray.py Show resolved Hide resolved
@shoyer shoyer merged commit 620b946 into pydata:master Jan 27, 2019
@spencerkclark spencerkclark mentioned this pull request Jan 27, 2019
Closed
3 tasks
@fmaussion fmaussion mentioned this pull request Jan 28, 2019
Merged
3 tasks
dcherian pushed a commit that referenced this pull request Jan 30, 2019
Squashed commit of the following:
56bc724 
commit 620b946
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Sun Jan 27 13:02:03 2019 -0800

    Fix test failures / warnings for pandas 0.24 (#2720)

    * Fix test failures / warnings for pandas 0.24

    Fixes GH2717

    * Brief doc note

    * Comment on name order

commit 882deac
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Sun Jan 27 09:11:47 2019 -0800

    DOC: refresh whats-new for 0.11.3 / 0.12.0 (#2718)

commit 8ca8efe
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Sat Jan 26 10:14:49 2019 -0800

    Update environment for doc build (#2708)

    * Update environment for doc build

    We were pinning very old versions for most of these packages. This should
    fix the failures on ReadTheDocs.

    * Build fixes

commit 2e99c7d
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Fri Jan 25 13:52:17 2019 -0800

    Print full environment fron conf.py (#2709)

    This should make it easier to debug the doc build environment.

commit cc5015a
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Fri Jan 25 11:55:07 2019 -0800

    BUG: ensure indexes are reset when coords are modified (#2707)

    This was introduced by the recent indexes refactor, but never made it into a
    release.

commit aabda43
Author: Joe Hamman <jhamman@ucar.edu>
Date:   Fri Jan 25 08:38:45 2019 -0800

    Remove py2 compat (#2645)

    * strip out PY2 compat code from pycompat.py

    * isort

    * remove 2 unused imports

    * remove extra import

    * no more future

    * no unicode literals

    * no more ReprMixin

    * cleanup merge

    * remove deprecated imports from collections

    * 2 more cleanups from shoyer
dcherian pushed a commit that referenced this pull request Jan 30, 2019
Squashed commit of the following:
67aa721 
commit 37a947a
Author: Deepak Cherian <dcherian@users.noreply.github.com>
Date:   Wed Jan 30 09:20:57 2019 -0800

    Refactor plot utils (#2670)

    * Refactor out utility functions.

    * facetgrid refactor

    1. refactor out _easy_facetgrid
    2. Combine map_dataarray_line with map_dataarray

    * flake8

    * Refactor out colorbar making to plot.utils._add_colorbar

    * Refactor out cmap_params, cbar_kwargs processing

    * Back to map_dataarray_line

    * lint

    * small rename

    * review comment.

    * Move _infer_line_data back.

commit fd2552a
Author: Spencer Clark <spencerkclark@gmail.com>
Date:   Wed Jan 30 11:45:09 2019 -0500

    Enable subtracting a scalar cftime.datetime object from a CFTimeIndex (#2672)

    * Enable subtracting a scalar cftime.datetime object from a CFTimeIndex

    * lint

    * Test cftime.datetime minus CFTimeIndex as well

    * Fix cftime minus CFTimeIndex

commit e8bf4bf
Author: Tom Nicholas <35968931+TomNicholas@users.noreply.github.com>
Date:   Wed Jan 30 02:02:22 2019 +0000

    Bugfix for line plot axes (#2726)

    * Fixed logic for setting line data

    * Added tests to check line data matches values of correct coords

    * Recorded bugfix for line plots

    * Update doc/whats-new.rst

    Co-Authored-By: TomNicholas <35968931+TomNicholas@users.noreply.github.com>

    * Update doc/whats-new.rst

    Co-Authored-By: TomNicholas <35968931+TomNicholas@users.noreply.github.com>

commit 620b946
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Sun Jan 27 13:02:03 2019 -0800

    Fix test failures / warnings for pandas 0.24 (#2720)

    * Fix test failures / warnings for pandas 0.24

    Fixes GH2717

    * Brief doc note

    * Comment on name order

commit 882deac
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Sun Jan 27 09:11:47 2019 -0800

    DOC: refresh whats-new for 0.11.3 / 0.12.0 (#2718)

commit 8ca8efe
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Sat Jan 26 10:14:49 2019 -0800

    Update environment for doc build (#2708)

    * Update environment for doc build

    We were pinning very old versions for most of these packages. This should
    fix the failures on ReadTheDocs.

    * Build fixes

commit 2e99c7d
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Fri Jan 25 13:52:17 2019 -0800

    Print full environment fron conf.py (#2709)

    This should make it easier to debug the doc build environment.

commit cc5015a
Author: Stephan Hoyer <shoyer@gmail.com>
Date:   Fri Jan 25 11:55:07 2019 -0800

    BUG: ensure indexes are reset when coords are modified (#2707)

    This was introduced by the recent indexes refactor, but never made it into a
    release.

commit aabda43
Author: Joe Hamman <jhamman@ucar.edu>
Date:   Fri Jan 25 08:38:45 2019 -0800

    Remove py2 compat (#2645)

    * strip out PY2 compat code from pycompat.py

    * isort

    * remove 2 unused imports

    * remove extra import

    * no more future

    * no unicode literals

    * no more ReprMixin

    * cleanup merge

    * remove deprecated imports from collections

    * 2 more cleanups from shoyer
dcherian pushed a commit to yohai/xarray that referenced this pull request Jan 30, 2019
Merge remote-tracking branch 'upstream/master' into yohai-ds_scatter
bce0152 
* upstream/master:
  Refactor plot utils (pydata#2670)
  Enable subtracting a scalar cftime.datetime object from a CFTimeIndex (pydata#2672)
  Bugfix for line plot axes (pydata#2726)
  Fix test failures / warnings for pandas 0.24 (pydata#2720)
  DOC: refresh whats-new for 0.11.3 / 0.12.0 (pydata#2718)
  Update environment for doc build (pydata#2708)
  Print full environment fron conf.py (pydata#2709)
  BUG: ensure indexes are reset when coords are modified (pydata#2707)
  Remove py2 compat (pydata#2645)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhamman jhamman jhamman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shoyer @jhamman