Skip to content

Make DataFrame arithmetic ops with 2D arrays behave like numpy analogues #23000

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

Merged
merged 14 commits into from
Oct 7, 2018
Merged

Make DataFrame arithmetic ops with 2D arrays behave like numpy analogues #23000

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2206df4
Make DataFrame arithmetic ops with 2D arrays behave like numpy analogues
jbrockmendel Oct 4, 2018
1616e41
fix incorrectly-written test
jbrockmendel Oct 4, 2018
a0e27da
Specify dtype to avoid failing on 32bit builds
jbrockmendel Oct 5, 2018
69fa4bb
Specify dtype to avoid failing on 32bit builds
jbrockmendel Oct 5, 2018
f67be3b
flake8 whitespace fixup
jbrockmendel Oct 5, 2018
78d4517
add shape assertions
jbrockmendel Oct 5, 2018
21ae42d
add shape assertions
jbrockmendel Oct 5, 2018
34edbb4
fix screwup
jbrockmendel Oct 5, 2018
b621145
Whatsnew entry
jbrockmendel Oct 5, 2018
7611163
Merge branch 'master' of https://github.com/pandas-dev/pandas into bcast
jbrockmendel Oct 6, 2018
23a96e5
suggested edits to whatsnew
jbrockmendel Oct 6, 2018
6fca5f5
another ipython:: python line
jbrockmendel Oct 6, 2018
855e49b
Add tests for all arithmetic ops
jbrockmendel Oct 6, 2018
01ab2b5
32bit compat
jbrockmendel Oct 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
suggested edits to whatsnew
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 6, 2018
commit 23a96e5d74de78db21c7c84366b72002ec9d9c95
10 changes: 6 additions & 4 deletions doc/source/whatsnew/v0.24.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,12 @@ Previous Behavior:
*Current Behavior*:

.. ipython:: python
In [3]: arr = np.arange(6).reshape(3, 2)
In [4]: df = pd.DataFrame(arr)
In [5]: df + arr[[0], :] # 1 row, 2 columns
In [6]: df + arr[:, [1]] # 1 column, 3 rows
arr = np.arange(6).reshape(3, 2)
df = pd.DataFrame(arr)
df

Copy link
Contributor

Choose a reason for hiding this comment

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

add another ipython:: python here, the blank line gets removed and it appears as a single block (the way it is written), if you add another block, then you get another cell

df + arr[[0], :] # 1 row, 2 columns
df + arr[:, [1]] # 1 column, 3 rows


.. _whatsnew_0240.api.extension:
Expand Down