Skip to content

Conversation

@shoyer
Copy link
Member

@shoyer shoyer commented Oct 24, 2019

Follow-up on #3436, needed now that Unidata/cftime#127 has been merged.

@shoyer shoyer mentioned this pull request Oct 24, 2019
3 tasks
@shoyer
Copy link
Member Author

shoyer commented Oct 24, 2019

There's another failure with pandas-master (see #3440), but I'm going to merge this as a step in the right direction.

@shoyer shoyer merged commit 9c6b457 into pydata:master Oct 24, 2019
dcherian added a commit to dcherian/xarray that referenced this pull request Oct 24, 2019
* upstream/master:
  minor lint tweaks (pydata#3429)
  Hack around pydata#3440 (pydata#3442)
  Update Terminology page to account for multidimensional coordinates (pydata#3410)
  Use cftime master for upstream-dev build (pydata#3439)
dcherian added a commit to dcherian/xarray that referenced this pull request Oct 24, 2019
…e-multiple-dims

* upstream/master:
  minor lint tweaks (pydata#3429)
  Hack around pydata#3440 (pydata#3442)
  Update Terminology page to account for multidimensional coordinates (pydata#3410)
  Use cftime master for upstream-dev build (pydata#3439)
dcherian added a commit to dcherian/xarray that referenced this pull request Oct 24, 2019
* upstream/master:
  minor lint tweaks (pydata#3429)
  Hack around pydata#3440 (pydata#3442)
  Update Terminology page to account for multidimensional coordinates (pydata#3410)
  Use cftime master for upstream-dev build (pydata#3439)
dcherian added a commit to dcherian/xarray that referenced this pull request Oct 25, 2019
* upstream/master:
  minor lint tweaks (pydata#3429)
  Hack around pydata#3440 (pydata#3442)
  Update Terminology page to account for multidimensional coordinates (pydata#3410)
  Use cftime master for upstream-dev build (pydata#3439)
  MAGA (Make Azure Green Again) (pydata#3436)
  Test that Dataset and DataArray resampling are identical (pydata#3412)
  Avoid multiplication DeprecationWarning in rasterio backend (pydata#3428)
  Sync with latest version of cftime (v1.0.4) (pydata#3430)
  Add cftime git tip to upstream-dev + temporarily pin cftime (pydata#3431)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant