Add CFTimeIndex.shift #2431
Merged
Add CFTimeIndex.shift #2431
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update what's new Add bug fix note
jhamman
reviewed
Sep 23, 2018
xarray/coding/cftimeindex.py
Outdated
| raise TypeError("'n' must be an int, got {}.".format(n)) | ||
| if isinstance(freq, timedelta): | ||
| return self + n * freq | ||
| elif isinstance(freq, basestring): |
There was a problem hiding this comment.
it looks like you need to import basestring from pycompat.
There was a problem hiding this comment.
Oops, thanks @jhamman.
shoyer
approved these changes
Sep 24, 2018
Conflicts: xarray/coding/cftimeindex.py xarray/tests/test_cftimeindex.py
shoyer
reviewed
Oct 2, 2018
xarray/coding/cftimeindex.py
Outdated
| if strings.ndim == 0: | ||
| return np.array(_parse_iso8601_without_reso(date_type, strings.item())) | ||
| else: | ||
| return np.array([_parse_iso8601_without_reso(date_type, s) |
There was a problem hiding this comment.
The cleanest way to do this is probably to flatten and then reshape the result, e.g.,
`np.array([_parse_iso8601_without_reso(date_type, s) for s in strings.ravel()]).reshape(strings.shape)
There was a problem hiding this comment.
nevermind, let's fix this later -- this was only from the merge commit :)
There was a problem hiding this comment.
No worries -- that probably is better. It snuck in with #2434. I'll submit a fix in the next few days.
dcherian
pushed a commit
to dcherian/xarray
that referenced
this pull request
Oct 7, 2018
* master: Replace the last of unittest with pytest (pydata#2467) Add python_requires to setup.py (pydata#2465) Clean up _parse_array_of_cftime_strings (pydata#2464) plot.contour: Don't make cmap if colors is a single color. (pydata#2453) np.AxisError was added in numpy 1.13 (pydata#2455) Add CFTimeIndex.shift (pydata#2431) Fix FutureWarning in CFTimeIndex.date_type (pydata#2448) fix:2445 (pydata#2446) Enable use of cftime.datetime coordinates with differentiate and interp (pydata#2434) restore ddof support in std (pydata#2447) Future warning for default reduction dimension of groupby (pydata#2366) Remove incorrect statement about "drop" in the text docs (pydata#2439) Use profile mechanism, not no-op mutation (pydata#2442) switch travis language to generic (pydata#2432)
dcherian
pushed a commit
to maahn/xarray
that referenced
this pull request
Oct 10, 2018
* master: (51 commits) xarray.backends refactor (pydata#2261) Fix indexing error for data loaded with open_rasterio (pydata#2456) Properly support user-provided norm. (pydata#2443) pep8speaks (pydata#2462) isort (pydata#2469) tests shoudn't need to pass for a PR (pydata#2471) Replace the last of unittest with pytest (pydata#2467) Add python_requires to setup.py (pydata#2465) Update whats-new.rst (pydata#2466) Clean up _parse_array_of_cftime_strings (pydata#2464) plot.contour: Don't make cmap if colors is a single color. (pydata#2453) np.AxisError was added in numpy 1.13 (pydata#2455) Add CFTimeIndex.shift (pydata#2431) Fix FutureWarning in CFTimeIndex.date_type (pydata#2448) fix:2445 (pydata#2446) Enable use of cftime.datetime coordinates with differentiate and interp (pydata#2434) restore ddof support in std (pydata#2447) Future warning for default reduction dimension of groupby (pydata#2366) Remove incorrect statement about "drop" in the text docs (pydata#2439) Use profile mechanism, not no-op mutation (pydata#2442) ...
dcherian
pushed a commit
to dcherian/xarray
that referenced
this pull request
Oct 10, 2018
* master: (21 commits) xarray.backends refactor (pydata#2261) Fix indexing error for data loaded with open_rasterio (pydata#2456) Properly support user-provided norm. (pydata#2443) pep8speaks (pydata#2462) isort (pydata#2469) tests shoudn't need to pass for a PR (pydata#2471) Replace the last of unittest with pytest (pydata#2467) Add python_requires to setup.py (pydata#2465) Update whats-new.rst (pydata#2466) Clean up _parse_array_of_cftime_strings (pydata#2464) plot.contour: Don't make cmap if colors is a single color. (pydata#2453) np.AxisError was added in numpy 1.13 (pydata#2455) Add CFTimeIndex.shift (pydata#2431) Fix FutureWarning in CFTimeIndex.date_type (pydata#2448) fix:2445 (pydata#2446) Enable use of cftime.datetime coordinates with differentiate and interp (pydata#2434) restore ddof support in std (pydata#2447) Future warning for default reduction dimension of groupby (pydata#2366) Remove incorrect statement about "drop" in the text docs (pydata#2439) Use profile mechanism, not no-op mutation (pydata#2442) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
whats-new.rstfor all changes andapi.rstfor new API (remove if this change should not be visible to users, e.g., if it is an internal clean-up, or if this is part of a larger project that will be documented later)