rebase and cleanup

Author: jreback

doc/source/whatsnew/v0.21.0.txt

@@ -309,28 +309,12 @@ New keywords
 - :func:`read_feather` has gained the ``nthreads`` parameter for multi-threaded operations (:issue:`16359`)
 - :func:`DataFrame.clip()` and :func:`Series.clip()` have gained an ``inplace`` argument. (:issue:`15388`)
 - :func:`crosstab` has gained a ``margins_name`` parameter to define the name of the row / column that will contain the totals when ``margins=True``. (:issue:`15972`)
-<<<<<<< HEAD
-- :func:`DataFrame.select_dtypes` now accepts scalar values for include/exclude as well as list-like. (:issue:`16855`)
-- :func:`date_range` now accepts 'YS' in addition to 'AS' as an alias for start of year (:issue:`9313`)
-- :func:`date_range` now accepts 'Y' in addition to 'A' as an alias for end of year (:issue:`9313`)
-- Integration with `Apache Parquet <https://parquet.apache.org/>`__, including a new top-level :func:`read_parquet` and :func:`DataFrame.to_parquet` method, see :ref:`here <io.parquet>`.
-- :func:`DataFrame.add_prefix` and :func:`DataFrame.add_suffix` now accept strings containing the '%' character. (:issue:`17151`)
-- `read_*` methods can now infer compression from non-string paths, such as ``pathlib.Path`` objects (:issue:`17206`).
-- :func:`pd.read_sas()` now recognizes much more of the most frequently used date (datetime) formats in SAS7BDAT files (:issue:`15871`).
-- :func:`DataFrame.items` and :func:`Series.items` is now present in both Python 2 and 3 and is lazy in all cases (:issue:`13918`, :issue:`17213`)
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
 - :func:`read_json` now accepts a ``chunksize`` parameter that can be used when ``lines=True``. If ``chunksize`` is passed, read_json now returns an iterator which reads in ``chunksize`` lines with each iteration. (:issue:`17048`)
 - :func:`read_json` and :func:`~DataFrame.to_json` now accept a ``compression`` argument which allows them to transparently handle compressed files. (:issue:`17798`)
 
 Various enhancements
 """"""""""""""""""""
 
->>>>>>> 95d4ba8... ENH: gb.is_monotonic_increasing #17015 fix rebase conflicts
 - Improved the import time of pandas by about 2.25x.  (:issue:`16764`)
 - Support for `PEP 519 -- Adding a file system path protocol
   <https://www.python.org/dev/peps/pep-0519/>`_ on most readers (e.g.
@@ -354,22 +338,6 @@ Various enhancements
 - :func:`read_excel` raises ``ImportError`` with a better message if ``xlrd`` is not installed. (:issue:`17613`)
 - :meth:`DataFrame.assign` will preserve the original order of ``**kwargs`` for Python 3.6+ users instead of sorting the column names. (:issue:`14207`)
 - :func:`Series.reindex`, :func:`DataFrame.reindex`, :func:`Index.get_indexer` now support list-like argument for ``tolerance``. (:issue:`17367`)
-<<<<<<< HEAD
-=======
-- :func: groupby.is_monotonic_increasing and .is_monotonic_decreasing extend Series.is_monotonic_increasing to groups, returning whether each group is monotonically increasing or decreasing, respectively. (:issue:`17015`)
-=======
-- is_monotonic_increasing/decreasing is added to .groupby(). (:issue:`17015`)
->>>>>>> 740c7c2... added tests for gb.is_monotonically_increasing()/decreasing
-=======
->>>>>>> 8ed37cd... removed edits to whatsnew 0.21.0
-
->>>>>>> e99897c... ENH: gb.is_monotonic_increasing, is_monotonic_decreasing  #17015
-=======
-
-
->>>>>>> ceceae1... ENH: gb.is_monotonic_increasing #17015 fix rebase conflicts
-=======
->>>>>>> 95d4ba8... ENH: gb.is_monotonic_increasing #17015 fix rebase conflicts
 
 .. _whatsnew_0210.api_breaking:
 

pandas/core/groupby.py

@@ -1695,7 +1695,6 @@ def tail(self, n=5):
         mask = self._cumcount_array(ascending=False) < n
         return self._selected_obj[mask]
 
-<<<<<<< HEAD
     def pipe(self, func, *args, **kwargs):
         """ Apply a function with arguments to this GroupBy object,
 
@@ -1744,8 +1743,6 @@ def pipe(self, func, *args, **kwargs):
         """
         return _pipe(self, func, *args, **kwargs)
 
-=======
->>>>>>> e99897c... ENH: gb.is_monotonic_increasing, is_monotonic_decreasing  #17015
     @Substitution(name='groupby')
     @Appender(_doc_template)
     def is_monotonic_increasing(self):

pandas/tests/groupby/test_groupby.py

@@ -3701,8 +3701,6 @@ def test_cummin_cummax(self):
         expected = pd.Series([1, 2, 1], name='b')
         tm.assert_series_equal(result, expected)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     @pytest.mark.parametrize('in_vals, out_vals', [
         # Basics: strictly increasing (T), strictly decreasing (F),
         # abs val increasing (F), non-strictly increasing (T)
@@ -3761,85 +3759,6 @@ def test_is_monotonic_decreasing(self, in_vals, out_vals):
         expected.index.name = 'B'
         tm.assert_series_equal(result, expected)
 
-=======
-    def test_is_increasing_is_decreasing(self):
-        # GH 17015
-
-=======
-    @pytest.mark.parametrize('in_vals, out_vals', [
->>>>>>> f8554ee... parametrized tests for gb.is_monotonic_increasing/decreasing
-        # Basics: strictly increasing (T), strictly decreasing (F),
-        # abs val increasing (F), non-strictly increasing (T)
-        ([1, 2, 5, 3, 2, 0, 4, 5, -6, 1, 1],
-         [True, False, False, True]),
-        # Test with inf vals
-        ([1, 2.1, np.inf, 3, 2, np.inf, -np.inf, 5, 11, 1, -np.inf],
-         [True, False, True, False]),
-        # Test with nan vals; should always be False
-        ([1, 2, np.nan, 3, 2, np.nan, np.nan, 5, -np.inf, 1, np.nan],
-         [False, False, False, False]),
-    ])
-    def test_is_monotonic_increasing(self, in_vals, out_vals):
-        # GH 17015
-        source_dict = {
-            'A': ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'],
-            'B': ['a', 'a', 'a', 'b', 'b', 'b', 'c', 'c', 'c', 'd', 'd'],
-            'C': in_vals}
-        df = pd.DataFrame(source_dict)
-        result = df.groupby(['B']).C.is_monotonic_increasing()
-        expected = pd.Series(index=['a', 'b', 'c', 'd'],
-                             data=out_vals,
-                             name='C')
-        expected.index.name = 'B'
-        tm.assert_series_equal(result, expected)
-
-        # Also check result equal to manually taking x.is_monotonic_increasing.
-        expected = (
-            df.groupby(['B']).C.apply(lambda x: x.is_monotonic_increasing))
-        tm.assert_series_equal(result, expected)
-
-    @pytest.mark.parametrize('in_vals, out_vals', [
-        # Basics: strictly decreasing (T), strictly increasing (F),
-        # abs val decreasing (F), non-strictly increasing (T)
-        ([10, 9, 7, 3, 4, 5, -3, 2, 0, 1, 1],
-         [True, False, False, True]),
-        # Test with inf vals
-        ([np.inf, 1, -np.inf, np.inf, 2, -3, -np.inf, 5, -3, -np.inf, -np.inf],
-         [True, True, False, True]),
-        # Test with nan vals; should always be False
-        ([1, 2, np.nan, 3, 2, np.nan, np.nan, 5, -np.inf, 1, np.nan],
-         [False, False, False, False]),
-    ])
-    def test_is_monotonic_decreasing(self, in_vals, out_vals):
-        # GH 17015
-        source_dict = {
-            'A': ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11'],
-            'B': ['a', 'a', 'a', 'b', 'b', 'b', 'c', 'c', 'c', 'd', 'd'],
-            'C': in_vals}
-
-        df = pd.DataFrame(source_dict)
-        result = df.groupby('B').C.is_monotonic_decreasing()
-        expected = pd.Series(index=['a', 'b', 'c', 'd'],
-                             data=out_vals,
-                             name='C')
-        expected.index.name = 'B'
-        tm.assert_series_equal(result, expected)
-<<<<<<< HEAD
->>>>>>> 740c7c2... added tests for gb.is_monotonically_increasing()/decreasing
-=======
-
->>>>>>> f8554ee... parametrized tests for gb.is_monotonic_increasing/decreasing
-        # Also check result equal to manually taking x.is_monotonic_decreasing.
-        expected = df.groupby('B').C.apply(lambda x: x.is_monotonic_decreasing)
-        tm.assert_series_equal(result, expected)
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
->>>>>>> 740c7c2... added tests for gb.is_monotonically_increasing()/decreasing
-=======
->>>>>>> f8554ee... parametrized tests for gb.is_monotonic_increasing/decreasing
     def test_apply_numeric_coercion_when_datetime(self):
         # In the past, group-by/apply operations have been over-eager
         # in converting dtypes to numeric, in the presence of datetime

pandas/tests/groupby/test_whitelist.py

@@ -239,7 +239,6 @@ def test_groupby_blacklist(df_letters):
 def test_tab_completion(mframe):
     grp = mframe.groupby(level='second')
     results = set([v for v in dir(grp) if not v.startswith('_')])
-<<<<<<< HEAD
     expected = set(
         ['A', 'B', 'C', 'agg', 'aggregate', 'apply', 'boxplot', 'filter',
          'first', 'get_group', 'groups', 'hist', 'indices', 'last', 'max',
@@ -250,26 +249,8 @@ def test_tab_completion(mframe):
          'cumsum', 'cumcount', 'ngroup', 'all', 'shift', 'skew',
          'take', 'tshift', 'pct_change', 'any', 'mad', 'corr', 'corrwith',
          'cov', 'dtypes', 'ndim', 'diff', 'idxmax', 'idxmin',
-<<<<<<< HEAD
          'ffill', 'bfill', 'pad', 'backfill', 'rolling', 'expanding', 'pipe',
-=======
-         'ffill', 'bfill', 'pad', 'backfill', 'rolling', 'expanding',
->>>>>>> e99897c... ENH: gb.is_monotonic_increasing, is_monotonic_decreasing  #17015
          'is_monotonic_increasing', 'is_monotonic_decreasing'])
-=======
-    expected = {
-        'A', 'B', 'C', 'agg', 'aggregate', 'apply', 'boxplot', 'filter',
-        'first', 'get_group', 'groups', 'hist', 'indices', 'last', 'max',
-        'mean', 'median', 'min', 'ngroups', 'nth', 'ohlc', 'plot',
-        'prod', 'size', 'std', 'sum', 'transform', 'var', 'sem', 'count',
-        'nunique', 'head', 'describe', 'cummax', 'quantile',
-        'rank', 'cumprod', 'tail', 'resample', 'cummin', 'fillna',
-        'cumsum', 'cumcount', 'ngroup', 'all', 'shift', 'skew',
-        'take', 'tshift', 'pct_change', 'any', 'mad', 'corr', 'corrwith',
-        'cov', 'dtypes', 'ndim', 'diff', 'idxmax', 'idxmin',
-        'ffill', 'bfill', 'pad', 'backfill', 'rolling', 'expanding', 'pipe',
-        'is_monotonic_increasing', 'is_monotonic_decreasing'}
->>>>>>> ceceae1... ENH: gb.is_monotonic_increasing #17015 fix rebase conflicts
     assert results == expected