Skip to content

Commit

Permalink
TST: isort tests/groupby (pandas-dev#24553)
Browse files Browse the repository at this point in the history
  • Loading branch information
simonjayhawkins authored and Pingviinituutti committed Feb 28, 2019
1 parent 9bc6640 commit ac95659
Show file tree
Hide file tree
Showing 20 changed files with 108 additions and 117 deletions.
10 changes: 5 additions & 5 deletions pandas/tests/groupby/aggregate/test_aggregate.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
test .agg behavior / note that .apply is tested generally in test_groupby.py
"""

import numpy as np
import pytest

import numpy as np
import pandas as pd
from pandas.compat import OrderedDict

from pandas import concat, DataFrame, Index, MultiIndex, Series
from pandas.core.groupby.grouper import Grouping
import pandas as pd
from pandas import DataFrame, Index, MultiIndex, Series, concat
from pandas.core.base import SpecificationError
from pandas.compat import OrderedDict
from pandas.core.groupby.grouper import Grouping
import pandas.util.testing as tm


Expand Down
7 changes: 3 additions & 4 deletions pandas/tests/groupby/aggregate/test_cython.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@

from __future__ import print_function

import numpy as np
import pytest

import numpy as np
import pandas as pd

from pandas import (bdate_range, DataFrame, Index, Series, Timestamp,
Timedelta, NaT)
from pandas import (
DataFrame, Index, NaT, Series, Timedelta, Timestamp, bdate_range)
from pandas.core.groupby.groupby import DataError
import pandas.util.testing as tm

Expand Down
12 changes: 6 additions & 6 deletions pandas/tests/groupby/aggregate/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@

from __future__ import print_function

import pytest
from collections import OrderedDict

import datetime as dt
from functools import partial

import numpy as np
import pandas as pd
import pytest

import pandas as pd
from pandas import (
date_range, DataFrame, Index, MultiIndex, PeriodIndex, period_range, Series
)
DataFrame, Index, MultiIndex, PeriodIndex, Series, date_range,
period_range)
from pandas.core.groupby.groupby import SpecificationError
from pandas.io.formats.printing import pprint_thing
import pandas.util.testing as tm

from pandas.io.formats.printing import pprint_thing


def test_agg_api():
# GH 6337
Expand Down
5 changes: 3 additions & 2 deletions pandas/tests/groupby/conftest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import pytest
import numpy as np
from pandas import MultiIndex, DataFrame
import pytest

from pandas import DataFrame, MultiIndex
from pandas.util import testing as tm


Expand Down
8 changes: 5 additions & 3 deletions pandas/tests/groupby/test_apply.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import pytest
from datetime import datetime

import numpy as np
import pytest

import pandas as pd
from datetime import datetime
from pandas import DataFrame, Index, MultiIndex, Series, bdate_range, compat
from pandas.util import testing as tm
from pandas import DataFrame, MultiIndex, compat, Series, bdate_range, Index


def test_apply_issues():
Expand Down
9 changes: 5 additions & 4 deletions pandas/tests/groupby/test_bin_groupby.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# -*- coding: utf-8 -*-

import numpy as np
from numpy import nan
import pytest

from numpy import nan
import numpy as np
from pandas._libs import groupby, lib, reduction

from pandas.core.dtypes.common import ensure_int64

from pandas import Index, isna
from pandas.core.groupby.ops import generate_bins_generic
from pandas.util.testing import assert_almost_equal
import pandas.util.testing as tm
from pandas._libs import lib, groupby, reduction
from pandas.util.testing import assert_almost_equal


def test_series_grouper():
Expand Down
14 changes: 8 additions & 6 deletions pandas/tests/groupby/test_categorical.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import print_function

from datetime import datetime

import numpy as np
import pytest

import numpy as np
import pandas as pd
from pandas.compat import PY37
from pandas import (Index, MultiIndex, CategoricalIndex,
DataFrame, Categorical, Series, qcut)
from pandas.util.testing import (assert_equal,
assert_frame_equal, assert_series_equal)

import pandas as pd
from pandas import (
Categorical, CategoricalIndex, DataFrame, Index, MultiIndex, Series, qcut)
import pandas.util.testing as tm
from pandas.util.testing import (
assert_equal, assert_frame_equal, assert_series_equal)


def cartesian_product_for_groupers(result, args, names):
Expand Down
8 changes: 4 additions & 4 deletions pandas/tests/groupby/test_counting.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import numpy as np
import pytest

from pandas import (DataFrame, Series, MultiIndex, Timestamp, Timedelta,
Period)
from pandas.util.testing import (assert_series_equal, assert_frame_equal)
from pandas.compat import (range, product as cart_product)
from pandas.compat import product as cart_product, range

from pandas import DataFrame, MultiIndex, Period, Series, Timedelta, Timestamp
from pandas.util.testing import assert_frame_equal, assert_series_equal


class TestCounting(object):
Expand Down
7 changes: 4 additions & 3 deletions pandas/tests/groupby/test_filters.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# -*- coding: utf-8 -*-
from __future__ import print_function
import pytest

import numpy as np
import pandas.util.testing as tm
from pandas import Timestamp, DataFrame, Series
import pytest

import pandas as pd
from pandas import DataFrame, Series, Timestamp
import pandas.util.testing as tm


def test_filter_series():
Expand Down
16 changes: 9 additions & 7 deletions pandas/tests/groupby/test_function.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import pytest
from string import ascii_lowercase

import numpy as np
import pandas as pd
from pandas import (DataFrame, Index, compat, isna,
Series, MultiIndex, Timestamp, date_range)
import pytest

from pandas.compat import product as cart_product
from pandas.errors import UnsupportedFunctionCall
from pandas.util import testing as tm

import pandas as pd
from pandas import (
DataFrame, Index, MultiIndex, Series, Timestamp, compat, date_range, isna)
import pandas.core.nanops as nanops
from string import ascii_lowercase
from pandas.compat import product as cart_product
from pandas.util import testing as tm


@pytest.mark.parametrize("agg_func", ['any', 'all'])
Expand Down
27 changes: 13 additions & 14 deletions pandas/tests/groupby/test_groupby.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
# -*- coding: utf-8 -*-
from __future__ import print_function

import pytest

from collections import defaultdict
from datetime import datetime
from decimal import Decimal

from pandas import (date_range, Timestamp,
Index, MultiIndex, DataFrame, Series,
Panel, read_csv)
from pandas.errors import PerformanceWarning
from pandas.util.testing import (assert_frame_equal,
assert_series_equal, assert_almost_equal)
from pandas.compat import (range, lrange, StringIO, lmap, lzip, map, zip,
OrderedDict)
from pandas import compat
from collections import defaultdict
import pandas.core.common as com
import numpy as np
import pytest

from pandas.compat import (
OrderedDict, StringIO, lmap, lrange, lzip, map, range, zip)
from pandas.errors import PerformanceWarning

import pandas.util.testing as tm
import pandas as pd
from pandas import (
DataFrame, Index, MultiIndex, Panel, Series, Timestamp, compat, date_range,
read_csv)
import pandas.core.common as com
import pandas.util.testing as tm
from pandas.util.testing import (
assert_almost_equal, assert_frame_equal, assert_series_equal)


def test_repr():
Expand Down
22 changes: 11 additions & 11 deletions pandas/tests/groupby/test_grouping.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@

""" test where we are determining what we are grouping, or getting groups """

import numpy as np
import pytest

from pandas import (date_range, Timestamp,
Index, MultiIndex, DataFrame, Series, CategoricalIndex)
from pandas.util.testing import (assert_panel_equal, assert_frame_equal,
assert_series_equal, assert_almost_equal)
from pandas.core.groupby.grouper import Grouping
from pandas.compat import lrange, long
from pandas.compat import long, lrange

from pandas import compat
import numpy as np

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

from pandas import (
CategoricalIndex, DataFrame, Index, MultiIndex, Series, Timestamp, compat,
date_range)
from pandas.core.groupby.grouper import Grouping
import pandas.util.testing as tm
from pandas.util.testing import (
assert_almost_equal, assert_frame_equal, assert_panel_equal,
assert_series_equal)

# selection
# --------------------------------


class TestSelection(object):

def test_select_bad_cols(self):
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/groupby/test_index_as_string.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest
import pandas as pd
import numpy as np
import pytest

import pandas as pd
from pandas.util.testing import assert_frame_equal, assert_series_equal


Expand Down
12 changes: 6 additions & 6 deletions pandas/tests/groupby/test_nth.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import numpy as np
import pandas as pd
from pandas import DataFrame, MultiIndex, Index, Series, isna, Timestamp
import pytest

from pandas.compat import lrange

import pandas as pd
from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, isna
from pandas.util.testing import (
assert_frame_equal,
assert_produces_warning,
assert_series_equal)
import pytest
assert_frame_equal, assert_produces_warning, assert_series_equal)


def test_first_last_nth(df):
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/groupby/test_rank.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import pytest
import numpy as np
import pytest

import pandas as pd
from pandas import DataFrame, Series, concat
from pandas.util import testing as tm
Expand Down
12 changes: 6 additions & 6 deletions pandas/tests/groupby/test_timegrouper.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
""" test with the TimeGrouper / grouping with datetimes """

import pytest
import pytz

from datetime import datetime

import numpy as np
from numpy import nan
import pytest
import pytz

from pandas.compat import StringIO

import pandas as pd
from pandas import (DataFrame, date_range, Index,
Series, MultiIndex, Timestamp)
from pandas import DataFrame, Index, MultiIndex, Series, Timestamp, date_range
from pandas.core.groupby.ops import BinGrouper
from pandas.compat import StringIO
from pandas.util import testing as tm
from pandas.util.testing import assert_frame_equal, assert_series_equal

Expand Down
18 changes: 9 additions & 9 deletions pandas/tests/groupby/test_transform.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
""" test with the .transform """

import numpy as np
import pytest

import numpy as np
import pandas as pd
from pandas.util import testing as tm
from pandas import Series, DataFrame, Timestamp, MultiIndex, concat, date_range
from pandas.core.dtypes.common import (
ensure_platform_int, is_timedelta64_dtype)
from pandas.compat import StringIO
from pandas._libs import groupby
from pandas.compat import StringIO

from pandas.util.testing import assert_frame_equal, assert_series_equal
from pandas.core.groupby.groupby import DataError
from pandas.core.dtypes.common import ensure_platform_int, is_timedelta64_dtype

import pandas as pd
from pandas import DataFrame, MultiIndex, Series, Timestamp, concat, date_range
from pandas.core.config import option_context
from pandas.core.groupby.groupby import DataError
from pandas.util import testing as tm
from pandas.util.testing import assert_frame_equal, assert_series_equal


def assert_fp_equal(a, b):
Expand Down
6 changes: 3 additions & 3 deletions pandas/tests/groupby/test_value_counts.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
and proper parameter handling
"""

import pytest

from itertools import product

import numpy as np
import pytest

from pandas import DataFrame, MultiIndex, Series, date_range
from pandas.util import testing as tm
from pandas import MultiIndex, DataFrame, Series, date_range


# our starting frame
Expand Down
6 changes: 4 additions & 2 deletions pandas/tests/groupby/test_whitelist.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
the so-called white/black lists
"""

import pytest
from string import ascii_lowercase

import numpy as np
from pandas import DataFrame, Series, compat, date_range, Index, MultiIndex
import pytest

from pandas import DataFrame, Index, MultiIndex, Series, compat, date_range
from pandas.util import testing as tm

AGG_FUNCTIONS = ['sum', 'prod', 'min', 'max', 'median', 'mean', 'skew',
Expand Down
Loading

0 comments on commit ac95659

Please sign in to comment.