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

Sync with latest version of cftime (v1.0.4) #3430

Merged
merged 6 commits into from
Oct 22, 2019
Merged

Sync with latest version of cftime (v1.0.4) #3430

merged 6 commits into from
Oct 22, 2019

Conversation

andersy005
Copy link
Member

@andersy005 andersy005 commented Oct 22, 2019 •
edited
Loading

  • Don't need dayofwk=-1 for cftime>=1.0.4

@andersy005 andersy005 changed the title Remove dayofwk=-1-- not needed for cftime>=1.0.4 Sync with latest version of cftime (v1.0.4) Oct 22, 2019
spencerkclark
spencerkclark reviewed Oct 22, 2019
View reviewed changes
Copy link
Member

@spencerkclark spencerkclark left a comment

Choose a reason for hiding this comment

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

Thanks for taking this on @andersy005. I just have a couple minor suggestions below, so that we maintain compatibility with versions of cftime prior to 1.0.4.

xarray/coding/cftime_offsets.py Outdated Show resolved Hide resolved
xarray/coding/cftimeindex.py Outdated Show resolved Hide resolved
@andersy005 @spencerkclark
Maintain backwards compatibility
6cc48f1 
Co-Authored-By: Spencer Clark <spencerkclark@gmail.com>
@pep8speaks
Copy link

pep8speaks commented Oct 22, 2019 •
edited
Loading

Hello @andersy005! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2019-10-22 15:40:39 UTC

spencerkclark
spencerkclark approved these changes Oct 22, 2019
View reviewed changes
Copy link
Member

@spencerkclark spencerkclark left a comment

Choose a reason for hiding this comment

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

Excellent, thanks @andersy005! This looks good to me regarding fixing #3426. We may need to wait for an answer in Unidata/cftime#126 to see what our plan should be for #3427, which seems to be caused by a separate issue.

@andersy005
Copy link
Member Author

@spencerkclark, thank you for the review, and looking into #3427! I was having a hard time debugging #3427 due to the opaque nature of cftime errors. In the meantime, I will keep an eye on the upstream issue you opened in unidata/cftime.

@dcherian
Copy link
Contributor

Thanks @andersy005, can you add a whats-new entry please.

@andersy005
Copy link
Member Author

can you add a whats-new entry please.

Done!

This was referenced Oct 22, 2019
Merged
Closed
@dcherian
Copy link
Contributor

Thanks @andersy005

@dcherian dcherian merged commit e258b88 into pydata:master Oct 22, 2019
@andersy005 andersy005 deleted the fix/cftime branch October 22, 2019 19:25
dcherian added a commit to dcherian/xarray that referenced this pull request Oct 22, 2019
@dcherian
Merge remote-tracking branch 'upstream/master' into fix/groupby-reduc…
fe0374b 
…e-multiple-dims

* upstream/master:
  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)
@dcherian dcherian mentioned this pull request Oct 22, 2019
Closed
3 tasks
dcherian added a commit to dcherian/xarray that referenced this pull request Oct 23, 2019
@dcherian
Merge remote-tracking branch 'upstream/master' into fix/groupby-nan
f196efb 
* upstream/master:
  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)
dcherian added a commit to dcherian/xarray that referenced this pull request Oct 25, 2019
@dcherian
Merge remote-tracking branch 'upstream/master' into interp-na-maxgap
c12e1da 
* 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)
@TimoRoth TimoRoth mentioned this pull request Nov 18, 2019
Closed
@spencerkclark spencerkclark mentioned this pull request Dec 16, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spencerkclark spencerkclark spencerkclark 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.

another cftime failure .sel() failures when using latest cftime release (v1.0.4)
4 participants
@andersy005 @pep8speaks @dcherian @spencerkclark