Fixturize tests/frame/test_indexing.py #25633

h-vetinari · 2019-03-10T17:09:20Z

One more step towards #22471. Happy to move the fixture to the test_indexing module if that's now the preferred form.

pandas/tests/frame/conftest.py

pandas/tests/frame/test_indexing.py

jreback

see comments. I don't really like to have multiple fixtures injected that are used in parts of tests. its just plain confusing (I know we let some thru before, but let's not do that anymore)

h-vetinari

Reflecting the points happening across several of these PRs, I'll:

keep the TestData "fixtures" in tests.frame.conftest
any new fixtures will stay in their respective modules
the effort for TST/CLN: remove TestData from frame-tests; replace with fixtures #22471 is strictly translation, no breakup of tests

pandas/tests/frame/conftest.py

pandas/tests/frame/test_indexing.py

codecov · 2019-03-10T17:44:48Z

Codecov Report

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

@@           Coverage Diff           @@
##           master   #25633   +/-   ##
=======================================
  Coverage   91.26%   91.26%           
=======================================
  Files         173      173           
  Lines       52968    52968           
=======================================
  Hits        48339    48339           
  Misses       4629     4629

Flag	Coverage Δ
#multiple	`89.83% <ø> (ø)`	⬆️
#single	`41.71% <ø> (ø)`	⬆️

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 df771cc...ddc1d44. Read the comment docs.

codecov · 2019-03-10T17:44:49Z

Codecov Report

Merging #25633 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #25633      +/-   ##
==========================================
+ Coverage   91.84%   91.85%   +<.01%     
==========================================
  Files         180      174       -6     
  Lines       50734    50722      -12     
==========================================
- Hits        46599    46589      -10     
+ Misses       4135     4133       -2

Flag	Coverage Δ
#multiple	`90.39% <ø> (-0.09%)`	⬇️
#single	`41.78% <ø> (-0.18%)`	⬇️

Impacted Files	Coverage Δ
pandas/plotting/_misc.py	`38.23% <0%> (-26.63%)`	⬇️
pandas/io/gbq.py	`78.94% <0%> (-21.06%)`	⬇️
pandas/io/gcs.py	`80% <0%> (-20%)`	⬇️
pandas/io/s3.py	`89.47% <0%> (-10.53%)`	⬇️
pandas/core/groupby/base.py	`91.83% <0%> (-8.17%)`	⬇️
pandas/plotting/_core.py	`83.77% <0%> (-5.61%)`	⬇️
pandas/io/excel/_xlrd.py	`94.54% <0%> (-5.46%)`	⬇️
pandas/io/clipboard/clipboards.py	`31.64% <0%> (-3.14%)`	⬇️
pandas/io/excel/_util.py	`87.32% <0%> (-2.68%)`	⬇️
pandas/core/internals/managers.py	`93.87% <0%> (-2.34%)`	⬇️
... and 93 more

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 de0867f...4e48d44. Read the comment docs.

h-vetinari · 2019-03-10T19:50:04Z

@jreback
Split up the test and it's green.

jreback · 2019-03-10T21:42:19Z

pandas/tests/frame/conftest.py

@@ -127,6 +127,17 @@ def timezone_frame():
    return df


+@pytest.fixture
+def uint64_frame():
+    """


instead of this can you just use the mixed_int_frame (maybe even add a column to it if needed)

Nope, not changing the semantics of tests here. Just translating.

pandas/tests/frame/test_indexing.py

jreback · 2019-03-10T21:43:58Z

pandas/tests/frame/test_indexing.py

-        piece = self.frame.loc[self.frame.index[:2], ['A', 'B']]
-        self.frame.loc[self.frame.index[-2]:, ['A', 'B']] = piece.values
-        result = self.frame.loc[self.frame.index[-2:], ['A', 'B']].values
+    def test_setitem_frame(self, float_frame, float_string_frame):


parametrize or split test

ok with splitting this test

jreback · 2019-03-10T21:44:08Z

pandas/tests/frame/test_indexing.py

                assert result == expected

-    def test_lookup(self):
+    def test_lookup(self, float_frame, float_string_frame):


same, see if you can split the test

h-vetinari

@jreback
You always insist on keeping PRs focused on one thing. Please don't try to force changing tests in a PR that is strictly for translation.

If you want to split tests, I'll do it as simply as possible (barring someone showing me some fixture magic that I'm not aware of).

h-vetinari · 2019-03-11T06:36:23Z

pandas/tests/frame/conftest.py

@@ -127,6 +127,17 @@ def timezone_frame():
    return df


+@pytest.fixture
+def uint64_frame():
+    """


Nope, not changing the semantics of tests here. Just translating.

pandas/tests/frame/test_indexing.py

h-vetinari · 2019-03-14T06:54:48Z

@jreback
Any suggestions how you would implement that fixturization you want?

jreback

frame/test_indexing.py is actually pretty huge. so pls change according to my comments, and open an issue to split this to separate smaller files (after)

pandas/tests/frame/test_indexing.py

jreback · 2019-03-20T01:29:42Z

pandas/tests/frame/test_indexing.py

-        piece = self.frame.loc[self.frame.index[:2], ['A', 'B']]
-        self.frame.loc[self.frame.index[-2]:, ['A', 'B']] = piece.values
-        result = self.frame.loc[self.frame.index[-2:], ['A', 'B']].values
+    def test_setitem_frame(self, float_frame, float_string_frame):


ok with splitting this test

jreback · 2019-03-20T01:29:54Z

pandas/tests/frame/test_indexing.py

                assert result == expected

-    def test_lookup(self):
+    def test_lookup(self, float_frame, float_string_frame):


same, see if you can split the test

…ndexing

This reverts commit d539d97.

jreback · 2019-04-20T17:31:28Z

this one might be ok, merge master and ping on green.

jreback · 2019-05-12T21:17:35Z

closing as stale

h-vetinari · 2019-05-13T05:47:56Z

@jreback

Sorry, I overlooked the request to merge master (busy times last month). Please reopen and I'll happily update.

simonjayhawkins · 2019-06-01T18:54:37Z

@h-vetinari can you merge master

Conflicting files
pandas/tests/frame/test_indexing.py

…ndexing

h-vetinari · 2019-06-01T19:57:55Z

@simonjayhawkins Thanks for reopening; merged master.

…ndexing

jreback

anyplace you are adding multiple fixtures should have the tests splits; there are only a couple and shouldn't be a big deal to do

jreback · 2019-06-02T23:46:14Z

pandas/tests/frame/test_indexing.py

@@ -1329,15 +1331,15 @@ def test_getitem_fancy_1d(self):
        # slice of mixed-frame


can you split this test

jreback · 2019-06-02T23:47:17Z

pandas/tests/frame/test_indexing.py

-    def test_xs(self):
-        idx = self.frame.index[5]
-        xs = self.frame.xs(idx)
+    def test_xs(self, float_frame, datetime_frame):


can you split

jreback · 2019-06-02T23:47:23Z

pandas/tests/frame/test_indexing.py

@@ -2582,7 +2593,8 @@ def test_boolean_indexing_mixed(self):
        with pytest.raises(TypeError, match=msg):
            df[df > 0.3] = 1

-    def test_where(self):
+    def test_where(self, float_string_frame, mixed_float_frame,


can you split

jreback · 2019-06-27T03:39:38Z

pls merge master and will look again

h-vetinari · 2019-06-28T06:59:21Z

Thanks for taking care of this!

jreback · 2019-06-28T12:13:46Z

thanks @h-vetinari

Fixturize tests/frame/test_indexing.py

ddc1d44

jreback reviewed Mar 10, 2019

View reviewed changes

pandas/tests/frame/conftest.py Show resolved Hide resolved

jreback reviewed Mar 10, 2019

View reviewed changes

pandas/tests/frame/test_indexing.py Show resolved Hide resolved

jreback requested changes Mar 10, 2019

View reviewed changes

jreback added the Testing pandas testing functions or related to the test suite label Mar 10, 2019

h-vetinari mentioned this pull request Mar 10, 2019

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

Closed

34 tasks

h-vetinari commented Mar 10, 2019

View reviewed changes

pandas/tests/frame/conftest.py Show resolved Hide resolved

pandas/tests/frame/test_indexing.py Show resolved Hide resolved

Review (jreback)

d539d97

jreback requested changes Mar 10, 2019

View reviewed changes

h-vetinari commented Mar 11, 2019

View reviewed changes

h-vetinari mentioned this pull request Mar 11, 2019

Fixturize tests/frame/test_dtypes.py #25636

Merged

jreback requested changes Mar 20, 2019

View reviewed changes

h-vetinari added 2 commits March 20, 2019 07:44

Merge remote-tracking branch 'upstream/master' into fixturize_frame_i…

faf3544

…ndexing

Revert "Review (jreback)"

5effd7c

This reverts commit d539d97.

h-vetinari mentioned this pull request Mar 20, 2019

TST: split up tests/frame/test_indexing.py #25798

Closed

Split up two tests (review jreback)

d4dfc17

jreback closed this May 12, 2019

simonjayhawkins reopened this Jun 1, 2019

h-vetinari added 2 commits June 1, 2019 21:56

Merge remote-tracking branch 'upstream/master' into fixturize_frame_i…

bfe3025

…ndexing

lint

599c6a3

retrigger azure

d1c0bf4

Merge remote-tracking branch 'upstream/master' into fixturize_frame_i…

df31996

…ndexing

jreback requested changes Jun 2, 2019

View reviewed changes

simonjayhawkins mentioned this pull request Jun 3, 2019

BUG: assignment to multiple columns when some column do not exist #26534

Closed

4 tasks

Merge branch 'master' into PR_TOOL_MERGE_PR_25633

4e48d44

jreback approved these changes Jun 27, 2019

View reviewed changes

jreback added this to the 0.25.0 milestone Jun 27, 2019

simonjayhawkins mentioned this pull request Jun 28, 2019

Split large test modules #26807

Closed

6 tasks

jreback merged commit a65b2e3 into pandas-dev:master Jun 28, 2019

h-vetinari deleted the fixturize_frame_indexing branch June 28, 2019 12:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixturize tests/frame/test_indexing.py #25633

Fixturize tests/frame/test_indexing.py #25633

h-vetinari commented Mar 10, 2019

jreback left a comment

h-vetinari left a comment

codecov bot commented Mar 10, 2019

codecov bot commented Mar 10, 2019 •

edited

Loading

h-vetinari commented Mar 10, 2019

jreback Mar 10, 2019

h-vetinari Mar 11, 2019

jreback Mar 10, 2019

jreback Mar 20, 2019

jreback Mar 10, 2019

jreback Mar 20, 2019

h-vetinari left a comment

h-vetinari Mar 11, 2019

h-vetinari commented Mar 14, 2019

jreback left a comment

jreback Mar 20, 2019

jreback Mar 20, 2019

jreback commented Apr 20, 2019

jreback commented May 12, 2019

h-vetinari commented May 13, 2019

simonjayhawkins commented Jun 1, 2019

h-vetinari commented Jun 1, 2019

jreback left a comment

jreback Jun 2, 2019

jreback Jun 2, 2019

jreback Jun 2, 2019

jreback commented Jun 27, 2019

h-vetinari commented Jun 28, 2019

jreback commented Jun 28, 2019

		@@ -1329,15 +1331,15 @@ def test_getitem_fancy_1d(self):
		# slice of mixed-frame

Fixturize tests/frame/test_indexing.py #25633

Fixturize tests/frame/test_indexing.py #25633

Conversation

h-vetinari commented Mar 10, 2019

jreback left a comment

Choose a reason for hiding this comment

h-vetinari left a comment

Choose a reason for hiding this comment

codecov bot commented Mar 10, 2019

Codecov Report

codecov bot commented Mar 10, 2019 • edited Loading

Codecov Report

h-vetinari commented Mar 10, 2019

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

h-vetinari left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

h-vetinari commented Mar 14, 2019

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

jreback commented Apr 20, 2019

jreback commented May 12, 2019

h-vetinari commented May 13, 2019

simonjayhawkins commented Jun 1, 2019

h-vetinari commented Jun 1, 2019

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

jreback commented Jun 27, 2019

h-vetinari commented Jun 28, 2019

jreback commented Jun 28, 2019

codecov bot commented Mar 10, 2019 •

edited

Loading