TST/CLN: series.duplicated; parametrisation; fix warning #21899

h-vetinari · 2018-07-13T21:10:31Z

Splitting up #21645

Added tests for duplicated, parametrized two tests for drop_duplicates, fixed a warning from #21614.

codecov · 2018-07-14T00:36:52Z

Codecov Report

Merging #21899 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master   #21899   +/-   ##
=======================================
  Coverage   91.96%   91.96%           
=======================================
  Files         166      166           
  Lines       50323    50323           
=======================================
  Hits        46281    46281           
  Misses       4042     4042

Flag	Coverage Δ
#multiple	`90.36% <ø> (ø)`	⬆️
#single	`42.22% <ø> (-0.01%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2b51c96...e640040. Read the comment docs.

jreback · 2018-07-14T14:31:06Z

pandas/tests/series/test_analytics.py

+            ('last', Series([False, True, True, False, False, False, False])),
+            (False, Series([False, True, True, False, True, True, False]))
+        ])
+    @pytest.mark.parametrize('npdtype', ['int_', 'uint', 'float_', 'unicode_'])


can you use the fixtures defined in pandas/conftest for the dtypes cc @gfyoung

@jreback
I tried

@pytest.mark.parametrize('npdtype', [any_int_dtype, float_dtype, string_dtype])

but pytest can't feed fixtures into parametrisation, see pytest-dev/pytest#349.

Not sure how to do this - separate tests?

you simply create a composite fixture

jreback · 2018-07-14T15:20:29Z

needs a rebase

gfyoung · 2018-07-14T17:06:03Z

pandas/conftest.py

+ALL_REAL_DTYPES = FLOAT_DTYPES + ALL_INT_DTYPES
+ALL_NUMPY_DTYPES = ALL_REAL_DTYPES + STRING_DTYPES + COMPLEX_DTYPES
+
+


Make sure that these lists aren't duplicated in the file.

@gfyoung, what do you mean? I removed ALL_REAL_DTYPES from above and brought it closer to where it's used. Or do you just want one block of all-caps definitions?

One block of all-caps definitions and use it everywhere in the file. For example, search for :

float, "float32", "float64"

in your version of conftest.py . You'll see it exists twice in the file.

pls put these with the other definitions

jreback · 2018-07-14T19:19:32Z

pandas/tests/series/test_duplicates.py

+            ('first', Series([False, False, False, False, True, True, False])),
+            ('last', Series([False, True, True, False, False, False, False])),
+            (False, Series([False, True, True, False, True, True, False]))
+        ])


either use 2 classes for test definitions or don’t use them (preferred)

same for frame

Classes of tests? I just wrote them in the same manner as in test_analytics and then transferred them here. You want me to get rid of TestSeriesDuplicates and do class-less tests - do I get that correctly?

yes that is the old format is much less readable

we only use classes if they r logical separations

jreback

for new modules we like to clean things up to conform

jreback · 2018-07-14T20:19:06Z

pandas/tests/series/test_duplicates.py

@@ -0,0 +1,145 @@
+# coding=utf-8
+# pylint: disable-msg=E1101,W0612


what are you disabling?

jreback · 2018-07-14T20:20:21Z

pandas/tests/series/test_duplicates.py

+import pytest
+
+import numpy as np
+import pandas as pd


don’t import pd, directly import instead

jreback · 2018-07-14T20:21:05Z

pandas/tests/series/test_duplicates.py

+from pandas import Series
+
+from pandas.util.testing import assert_series_equal
+import pandas.util.testing as tm


use tm; don’t import assert_series_equal

h-vetinari · 2018-07-14T20:31:37Z

@jreback All just left-overs from the previous module. Hopefully converging on a clean module soon... ;-)

jreback · 2018-07-14T20:33:49Z

@h-vetinari absolutely - is just easier to fix when exracting things and make nice and clean

jreback

can u do the same for frame? (unique and duplicates)

jreback · 2018-07-14T20:34:35Z

pandas/conftest.py

@@ -248,7 +248,19 @@ def tz_aware_fixture(request):
    return request.param


-@pytest.fixture(params=[str, 'str', 'U'])
+UNSIGNED_INT_DTYPES = ["uint8", "uint16", "uint32", "uint64"]
+SIGNED_INT_DTYPES = [int, "int8", "int16", "int32", "int64"]


@gfyoung this is ok? it follows our existing pattern?

@jreback @gfyoung I only added COMPLEX_DTYPES, STRING_DTYPES (which was just giving names to existing collections) and ALL_NUMPY_DTYPES - the rest was just reordering.

jreback · 2018-07-14T20:35:27Z

pandas/tests/series/test_duplicates.py

+
+import pytest
+
+import numpy as np


you can remove space between pandas imports

h-vetinari · 2018-07-14T20:44:20Z

can u do the same for frame? (unique and duplicates)

@jreback I did the same for frame in #21898

h-vetinari · 2018-07-14T20:49:35Z

@jreback Actually, did the same for #21900 as well - e.g. replace pd. with direct imports

jreback · 2018-07-16T10:55:37Z

thanks @h-vetinari

…21899)

h-vetinari mentioned this pull request Jul 13, 2018

ENH: add return_inverse to duplicated for DataFrame/Series/Index/MultiIndex #21645

Closed

jreback requested changes Jul 14, 2018

View reviewed changes

jreback added the Testing pandas testing functions or related to the test suite label Jul 14, 2018

jreback added this to the 0.24.0 milestone Jul 14, 2018

TST/CLN: series.duplicated; parametrisation; fix warning

4ca9dee

h-vetinari force-pushed the tst_series_analytics branch from d851ec9 to 2a649b6 Compare July 14, 2018 15:32

Incorporate review (jreback)

c06442b

h-vetinari force-pushed the tst_series_analytics branch from 2a649b6 to c06442b Compare July 14, 2018 15:38

Split off duplicates/unique tests into separate file

92d708c

gfyoung reviewed Jul 14, 2018

View reviewed changes

jreback requested changes Jul 14, 2018

View reviewed changes

Change tests away from classes; reorder conftest.py

12d2888

h-vetinari force-pushed the tst_series_analytics branch from f61e6a6 to 12d2888 Compare July 14, 2018 20:11

Typos

c9a3f71

jreback requested changes Jul 14, 2018

View reviewed changes

Further cleanup

d34b7d1

jreback requested changes Jul 14, 2018

View reviewed changes

Remove space

e640040

jreback approved these changes Jul 16, 2018

View reviewed changes

jreback merged commit 55cbd7d into pandas-dev:master Jul 16, 2018

h-vetinari deleted the tst_series_analytics branch July 17, 2018 07:17

aeltanawy pushed a commit to aeltanawy/pandas that referenced this pull request Jul 20, 2018

TST/CLN: series.duplicated; parametrisation; fix warning (pandas-dev#…

ea60bfd

…21899)

h-vetinari mentioned this pull request Aug 7, 2018

TST/CLN: break up & parametrize tests for df.set_index #22236

Merged

This was referenced Sep 16, 2018

TST/CLN: remove TestData from series-tests; replace with fixtures #22550

Closed

TST/CLN: remove TestData from frame-tests; replace with fixtures #22471

Closed

h-vetinari mentioned this pull request Sep 23, 2018

CLN: res/exp and GH references in frame tests #22730

Merged

3 tasks

Sup3rGeo pushed a commit to Sup3rGeo/pandas that referenced this pull request Oct 1, 2018

TST/CLN: series.duplicated; parametrisation; fix warning (pandas-dev#…

94621f2

…21899)

h-vetinari mentioned this pull request Oct 6, 2018

CLN: Use consistent imports in tests #23018

Closed

This was referenced Nov 28, 2018

TST: add test coverage for maybe_promote #23982

Merged

TST: fix fixture for numpy dtypes #23983

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TST/CLN: series.duplicated; parametrisation; fix warning #21899

TST/CLN: series.duplicated; parametrisation; fix warning #21899

h-vetinari commented Jul 13, 2018 •

edited

Loading

codecov bot commented Jul 14, 2018 •

edited

Loading

jreback Jul 14, 2018

h-vetinari Jul 14, 2018

jreback Jul 14, 2018

jreback commented Jul 14, 2018

gfyoung Jul 14, 2018

h-vetinari Jul 14, 2018

gfyoung Jul 14, 2018

jreback Jul 14, 2018

jreback Jul 14, 2018

jreback Jul 14, 2018

h-vetinari Jul 14, 2018

jreback Jul 14, 2018

jreback left a comment

jreback Jul 14, 2018

jreback Jul 14, 2018

jreback Jul 14, 2018

h-vetinari commented Jul 14, 2018

jreback commented Jul 14, 2018

jreback left a comment

jreback Jul 14, 2018

h-vetinari Jul 14, 2018 •

edited

Loading

jreback Jul 14, 2018

h-vetinari commented Jul 14, 2018 •

edited

Loading

h-vetinari commented Jul 14, 2018

jreback commented Jul 16, 2018

		ALL_REAL_DTYPES = FLOAT_DTYPES + ALL_INT_DTYPES
		ALL_NUMPY_DTYPES = ALL_REAL_DTYPES + STRING_DTYPES + COMPLEX_DTYPES

		@@ -0,0 +1,145 @@
		# coding=utf-8
		# pylint: disable-msg=E1101,W0612

TST/CLN: series.duplicated; parametrisation; fix warning #21899

TST/CLN: series.duplicated; parametrisation; fix warning #21899

Conversation

h-vetinari commented Jul 13, 2018 • edited Loading

codecov bot commented Jul 14, 2018 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jreback commented Jul 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jreback left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

h-vetinari commented Jul 14, 2018

jreback commented Jul 14, 2018

jreback left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

h-vetinari Jul 14, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

h-vetinari commented Jul 14, 2018 • edited Loading

h-vetinari commented Jul 14, 2018

jreback commented Jul 16, 2018

h-vetinari commented Jul 13, 2018 •

edited

Loading

codecov bot commented Jul 14, 2018 •

edited

Loading

h-vetinari Jul 14, 2018 •

edited

Loading

h-vetinari commented Jul 14, 2018 •

edited

Loading