10000 some backports for 1.9.2 by juliantaylor · Pull Request #5500 · numpy/numpy · GitHub
[go: up one dir, main page]

Skip to content

some backports for 1.9.2 #5500

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.

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

Merged
merged 7 commits into from
Feb 1, 2015

Conversation

juliantaylor
Copy link
Contributor

minor but also safe backports
gh-5489, gh-4181, gh-4476

LeartS and others added 5 commits January 25, 2015 17:02
Current loadtxt with `comments=None` considers the string `'None'` as a
comment symbol. Fixed by making split_line method check if comments is
None.

Closes numpy#5155.
This commit fixes bug numpy#4476 by adding the codes for the datetime64 and
timedelta64 types to the `default_filler` dictionary in numpy.ma.core,
used by `default_fill_value`.  Also adapt checking in the
`default_fill_value` to include code for timedelta64, not only datetime64.
Add a testcase `test_fillvalue_datetime_timedelta` to class
`TestFillingValues` for the fix to bug numpy#4476.  See commit
216fd17 and pull request numpy#5455.
@juliantaylor
Copy link
Contributor Author

added release notes

@juliantaylor juliantaylor force-pushed the backports-1.9.2 branch 2 times, most recently from 6a32482 to f3b5ec1 Compare January 25, 2015 16:57
charris and others added 2 commits January 27, 2015 21:44
The Python.h header likes to be included first, otherwise warnings about
redefining "_POSIX_C_SOURCE" and "_XOPEN_SOURCE" are generated. This is
really a problem with the Python.h header, but can be worked around by
changing the order of inclusion.
juliantaylor added a commit that referenced this pull request Feb 1, 2015
@juliantaylor juliantaylor merged commit 311d937 into numpy:maintenance/1.9.x Feb 1, 2015
@juliantaylor juliantaylor deleted the backports-1.9.2 branch February 1, 2015 16:30
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.

3 participants
0