8000 REF: collect ops dispatch functions in one place, try to de-duplicate SparseDataFrame methods by jbrockmendel · Pull Request #23060 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

REF: collect ops dispatch functions in one place, try to de-duplicate SparseDataFrame methods #23060

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 17 commits into from
Oct 28, 2018
Merged

REF: collect ops dispatch functions in one place, try to de-duplicate SparseDataFrame methods #23060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c01c19a
collect dispatch functions in one place
jbrockmendel Oct 9, 2018
f0e0a4e
remove unused try_cast args; try to make SparseDataFrame methods more…
jbrockmendel Oct 9, 2018
30f3737
Use align methods in SparseDataFrame methods to move towards sharing …
jbrockmendel Oct 9, 2018
5f9d111
typo fixup
jbrockmendel Oct 9, 2018
f236663
fixup copy/paste mistake
jbrockmendel Oct 9, 2018
1a556bc
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Oct 9, 2018
bcb1c35
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Oct 10, 2018
1c9b86b
keep collecting arithmetic tests
jbrockmendel Oct 10, 2018
a2d1a56
keep collecting Series arith tests
jbrockmendel Oct 10, 2018
27c40cb
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Oct 10, 2018
9835825
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Oct 21, 2018
9737aee
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Oct 23, 2018
945beb2
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Oct 23, 2018
ecaac45
fixup duplicate import
jbrockmendel Oct 23, 2018
1d08646
Merge branch 'master' of https://git 8000 hub.com/pandas-dev/pandas into fa…
jbrockmendel Oct 25, 2018
11219fe
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa…
jbrockmendel Oct 28, 2018
c431373
post-merge cleanup
jbrockmendel Oct 28, 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
Merge branch 'master' of https://github.com/pandas-dev/pandas into fa… 
…iling2
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 28, 2018
commit 11219fe2a9ab951364b2b5312469ce9190a719cf
7 changes: 3 additions & 4 deletions pandas/tests/series/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
import numpy as np
import pytest

from pandas import compat, Series
from pandas.core.indexes.period import IncompatibleFrequency

import pandas as pd
import pandas.util.testing as tm
from pandas import Series
from pandas.core.indexes.period import IncompatibleFrequency
from pandas import compat, Series


def _permute(obj):
return obj.take(np.random.permutation(len(obj)))
Expand Down
3 changes: 0 additions & 3 deletions pandas/tests/series/test_operators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
from numpy import nan

import pandas as pd

from pandas import (Index, Series, DataFrame, isna, bdate_range,
NaT, date_range, Categorical)
import pandas.core.nanops as nanops
import pandas.util.testing as tm
from pandas import (
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/series/test_period.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
import pytest

import pandas as pd
import pandas.util.testing as tm

import pandas.util.testing as tm
from pandas import DataFrame, Period, Series, period_range
from pandas.core.arrays import PeriodArray


Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0