parametrize the first few arithmetic tests #18133

jbrockmendel · 2017-11-06T05:03:25Z

Start parametrizing arithmetic tests for DatetimeIndex and TimedeltaIndex, with an eye towards re-usability.

Labelling tests with the types of operands and the operations, e.g. "test_dti_add_int" for DatetimeIndex + integer. This make it really easy to tell which combinations are and aren't implemented.

pep8speaks · 2017-11-06T05:03:27Z

Hello @jbrockmendel! Thanks for updating the PR.

Cheers ! There are no PEP8 issues in this Pull Request. 🍻

Comment last updated on November 09, 2017 at 17:25 Hours UTC

jreback · 2017-11-06T18:23:49Z

pandas/tests/indexes/datetimes/test_arithmetic.py

        idx = DatetimeIndex(['2011-01-01', '2011-01-02'])
        msg = "cannot add DatetimeIndex and Timestamp"
        with tm.assert_raises_regex(TypeError, msg):
            idx + Timestamp('2011-01-01')

+    def test_dti_radd_timestamp_raises(self):


we usually call these errors

jreback · 2017-11-06T18:24:15Z

pandas/tests/indexes/datetimes/test_arithmetic.py

-            tm.assert_index_equal(result, expected)
-            rng += 1
-            tm.assert_index_equal(rng, expected)
+    # Several ways of representing two hours


you should make this a fixture

Just getting comfortable with pytest.parametrize, will look into fixtures. Mind saving for a follow-up? I want to avoid making the mistake of having multiple active PRs touching the same modules lest rebase-hell ensue. Things Learned The Hard Way, Volume 8.

well this ends up add and then removing lots of code
would just like to see it down once

Fair enough.

jreback · 2017-11-06T18:25:29Z

pandas/tests/indexes/datetimes/test_arithmetic.py

+
+    @pytest.mark.parametrize('delta', two_hour_variants)
+    @pytest.mark.parametrize('tz', tz)
+    def test_dti_add_timedeltalike(self, tz, delta):


then you just add two_hour_variants as an argument (it will work the same way but actually slightly shorter). you ca also make tz a fixture and then the signatures are really simple, e.g. (assume both are fixtures)

def test_dti_add_timedeltalike(self, tz, two_hour_variants): ....

with test the product of tz x two_hour_variants

codecov · 2017-11-06T20:03:37Z

Codecov Report

Merging #18133 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #18133      +/-   ##
==========================================
- Coverage   91.28%   91.26%   -0.02%     
==========================================
  Files         163      163              
  Lines       50122    50127       +5     
==========================================
- Hits        45752    45749       -3     
- Misses       4370     4378       +8

Flag	Coverage Δ
#multiple	`89.07% <ø> (ø)`	⬆️
#single	`40.32% <ø> (-0.06%)`	⬇️

Impacted Files	Coverage Δ
pandas/io/gbq.py	`25% <0%> (-58.34%)`	⬇️
pandas/core/frame.py	`97.75% <0%> (-0.1%)`	⬇️
pandas/io/parsers.py	`95.58% <0%> (+0.07%)`	⬆️

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 1181622...536c160. Read the comment docs.

codecov · 2017-11-06T20:03:40Z

Codecov Report

Merging #18133 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #18133      +/-   ##
==========================================
- Coverage   91.42%    91.4%   -0.02%     
==========================================
  Files         163      163              
  Lines       50064    50064              
==========================================
- Hits        45772    45763       -9     
- Misses       4292     4301       +9

Flag	Coverage Δ
#multiple	`89.21% <ø> (ø)`	⬆️
#single	`40.36% <ø> (-0.06%)`	⬇️

Impacted Files	Coverage Δ
pandas/io/gbq.py	`25% <0%> (-58.34%)`	⬇️
pandas/core/frame.py	`97.8% <0%> (-0.1%)`	⬇️

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 17e0b13...8e4bfa5. Read the comment docs.

jbrockmendel · 2017-11-06T22:33:06Z

After spending a little time with the docs/examples, I think pytest.fixture is going to stay outside my comfort zone for a while.

jreback · 2017-11-08T20:58:39Z

look at pandas/tests/reshape/test_merge.py for an example (or pandas/tests/io/tests_parquet.py for more sophisticated usage)

jbrockmendel · 2017-11-09T04:27:36Z

look at pandas/tests/reshape/test_merge.py for an example

The fixtures there look like they each provide a single DataFrame. We need separate tests for each timezone. Something like:

@pytest.fixture
def tz():
    return [None, 'UTC', 'Asia/Tokyo', 'US/Eastern', 'dateutil/Asia/Singapore',
            'dateutil/US/Pacific']

class Whatever:
     def test_dti_add_timedeltalike(self, tz, delta):

would pass the whole tz fixture as the argument wouldn't it?

jreback · 2017-11-09T04:32:46Z

“””
@pytest.fixture(params=[None, 'UTC', 'Asia/Tokyo', 'US/Eastern', 'dateutil/Asia/Singapore',
'dateutil/US/Pacific'])
def tz(request):
return request.param
“””

jbrockmendel · 2017-11-09T04:44:40Z

Too much magic for me, can't implement that with a clear conscience. We've got a good clean win here using pytest.parametrize in more places than before.

jreback · 2017-11-09T12:26:32Z

fixed up. pls always rebase when you push on anything.

jbrockmendel · 2017-11-09T15:58:35Z

Travis error is looks like a DNS fail. Kind of refreshing to not be a Clipboard thing.

…o_hours

…to two_hours

jreback · 2017-11-09T16:52:09Z

i think all mac builds are borked atm

jbrockmendel · 2017-11-09T17:33:53Z

i think all mac builds are borked atm

Yikes. Just holler if I can do something useful; otherwise I'll stay out of the way.

jreback · 2017-11-09T18:25:48Z

thanks @jbrockmendel

parametrize the first few arithmetic tests

b444061

whitespace fixup

29ecf6c

gfyoung added the Testing pandas testing functions or related to the test suite label Nov 6, 2017

jbrockmendel added 2 commits November 6, 2017 07:55

fix missing params

7736dd7

fix parametrization screwup

536c160

jreback requested changes Nov 6, 2017

View reviewed changes

whitespace fixup

7360f87

jbrockmendel and others added 6 commits November 9, 2017 07:13

parametrize the first few arithmetic tests

e3e15ea

whitespace fixup

3acabb7

fix missing params

c5709e4

fix parametrization screwup

79bf017

whitespace fixup

ec44623

use fixtures

a2aef2a

jreback force-pushed the two_hours branch from 7360f87 to a2aef2a Compare November 9, 2017 12:25

jreback added this to the 0.22.0 milestone Nov 9, 2017

jreback approved these changes Nov 9, 2017

View reviewed changes

jbrockmendel added 2 commits November 9, 2017 07:59

Merge branch 'master' of https://github.com/pandas-dev/pandas into tw…

dec4f52

…o_hours

Merge branch 'two_hours' of https://github.com/jbrockmendel/pandas in…

39733ad

…to two_hours

dummy commit to force CI

8e4bfa5

jreback merged commit 2f9d4fb into pandas-dev:master Nov 9, 2017

watercrossing pushed a commit to watercrossing/pandas that referenced this pull request Nov 10, 2017

parametrize the first few arithmetic tests (pandas-dev#18133)

44d42b9

No-Stream pushed a commit to No-Stream/pandas that referenced this pull request Nov 28, 2017

parametrize the first few arithmetic tests (pandas-dev#18133)

0452446

jbrockmendel deleted the two_hours branch December 8, 2017 19:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

parametrize the first few arithmetic tests #18133

parametrize the first few arithmetic tests #18133

jbrockmendel commented Nov 6, 2017

pep8speaks commented Nov 6, 2017 •

edited

Loading

jreback Nov 6, 2017

jreback Nov 6, 2017

jbrockmendel Nov 6, 2017

jreback Nov 6, 2017

jbrockmendel Nov 6, 2017

jreback Nov 6, 2017

codecov bot commented Nov 6, 2017

codecov bot commented Nov 6, 2017 •

edited

Loading

jbrockmendel commented Nov 6, 2017

jreback commented Nov 8, 2017

jbrockmendel commented Nov 9, 2017

jreback commented Nov 9, 2017

jbrockmendel commented Nov 9, 2017

jreback commented Nov 9, 2017

jbrockmendel commented Nov 9, 2017

jreback commented Nov 9, 2017

jbrockmendel commented Nov 9, 2017

jreback commented Nov 9, 2017

parametrize the first few arithmetic tests #18133

parametrize the first few arithmetic tests #18133

Conversation

jbrockmendel commented Nov 6, 2017

pep8speaks commented Nov 6, 2017 • edited Loading

Comment last updated on November 09, 2017 at 17:25 Hours UTC

jreback Nov 6, 2017

Choose a reason for hiding this comment

jreback Nov 6, 2017

Choose a reason for hiding this comment

jbrockmendel Nov 6, 2017

Choose a reason for hiding this comment

jreback Nov 6, 2017

Choose a reason for hiding this comment

jbrockmendel Nov 6, 2017

Choose a reason for hiding this comment

jreback Nov 6, 2017

Choose a reason for hiding this comment

codecov bot commented Nov 6, 2017

Codecov Report

codecov bot commented Nov 6, 2017 • edited Loading

Codecov Report

jbrockmendel commented Nov 6, 2017

jreback commented Nov 8, 2017

jbrockmendel commented Nov 9, 2017

jreback commented Nov 9, 2017

jbrockmendel commented Nov 9, 2017

jreback commented Nov 9, 2017

jbrockmendel commented Nov 9, 2017

jreback commented Nov 9, 2017

jbrockmendel commented Nov 9, 2017

jreback commented Nov 9, 2017

pep8speaks commented Nov 6, 2017 •

edited

Loading

codecov bot commented Nov 6, 2017 •

edited

Loading