Merge commit #3
Merged
Merge commit #3
Conversation
This file contains hidden or 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
* Use argument dtype to inform coercion
Master:
```python
>>> import dask.dataframe as dd
>>> s = dd.core.Scalar({('s', 0): 10}, 's', 'i8')
>>> pdf = pd.DataFrame({'a': [1, 2, 3, 4, 5, 6, 7],
... 'b': [7, 6, 5, 4, 3, 2, 1]})
>>> (pdf + s).dtypes
a object
b object
dtype: object
Head:
```
>>> (pdf + s).dtypes
a int64
b int64
dtype: object
```
This is more consistent with 0.20.3, while still most of the changes in
#16821
Closes #17767
* Compat for older numpy where bool(dtype) is False
* Added timedelta
* DOC: Column indexes should use the same metadata as columns * Fix metadata field name * Remove column_index_names
* ENH: Add tranparent compression to json reading/writing This works in the same way as the argument to ``read_csv`` and ``to_csv``. I've added tests confirming that it works with both file paths, as well and file URLs and S3 URLs. * Fix PEP8 violations * Add PR number to whatsnew entry * Remove problematic Windows test (The S3 test hits the same edge case) * Extract decompress file function so that pytest.paramatrize can be used cleanly * Fix typo in whatsnew entry
Docs typo in inference.pyx
…1.0 whatsnew (#18204) * DOC: clarfiy sum of empty Series case in 0.21.0 whatsnew * DOC: emphasize matplotlib changes
* STYLE: clean up flake8 exceptions * TST: skip if no bs4 for some html tests * TST: fix local timezone checking with .timestamp()
* COMPAT: remove deprecation warnings for numpy 1.14 COMPAT: sas7bdat warning of unclosed file with 0 rows * COMPAT: json warning * COMPAT: numpy warnings on invalid indexer in computation
CI: change 2.7-build_test -> 3.6-build_test
xref #17996 Author: Pietro Battiston <[email protected]> Closes #18249 from toobaz/groupby_tuples and squashes the following commits: dafc838 [Pietro Battiston] DOC: Clarification of groupby(by=) argument e0bdfa7 [Pietro Battiston] TST: Test for tuples in columns, fixes to previous tests 74f91e0 [Pietro Battiston] TST: Fix tests which used tuples to pass multiple keys 201a4fe [Pietro Battiston] BUG: Never interpret a tuple as a list of keys
This allows e.g. to specify filters for predicate pushdown to fastparquet.
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.
git diff upstream/master -u -- "*.py" | flake8 --diff