REF/TST: Add more pytest idiom to resample/test_datetime_index.py #24414

simonjayhawkins · 2018-12-24T16:49:10Z

[ n/a] xref TST/MAINT: split up test_resample.py to make it more understandable #17806
tests added / passed
passes git diff upstream/master -u -- "*.py" | flake8 --diff
[ n/a] whatsnew entry

codecov · 2018-12-24T17:42:13Z

Codecov Report

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

@@            Coverage Diff             @@
##           master   #24414      +/-   ##
==========================================
+ Coverage    92.3%    92.3%   +<.01%     
==========================================
  Files         163      163              
  Lines       51943    51943              
==========================================
+ Hits        47946    47947       +1     
+ Misses       3997     3996       -1

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

Impacted Files	Coverage Δ
pandas/util/testing.py	`87.84% <0%> (+0.09%)`	⬆️

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 fc7bc3f...525ec03. Read the comment docs.

codecov · 2018-12-24T17:42:14Z

Codecov Report

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

@@            Coverage Diff             @@
##           master   #24414      +/-   ##
==========================================
- Coverage    92.3%   92.29%   -0.02%     
==========================================
  Files         163      163              
  Lines       51987    51969      -18     
==========================================
- Hits        47989    47967      -22     
- Misses       3998     4002       +4

Flag	Coverage Δ
#multiple	`90.7% <ø> (-0.02%)`	⬇️
#single	`43.01% <ø> (+0.01%)`	⬆️

Impacted Files	Coverage Δ
pandas/core/indexes/period.py	`92.75% <0%> (-0.33%)`	⬇️
pandas/core/indexes/timedeltas.py	`90.11% <0%> (-0.31%)`	⬇️
pandas/tseries/offsets.py	`96.69% <0%> (-0.26%)`	⬇️
pandas/core/arrays/datetimelike.py	`95.93% <0%> (-0.22%)`	⬇️
pandas/core/indexes/datetimes.py	`96.31% <0%> (-0.02%)`	⬇️
pandas/core/indexes/datetimelike.py	`97.7% <0%> (+0.11%)`	⬆️

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 08c920e...55b3954. Read the comment docs.

pandas/tests/resample/conftest.py

pep8speaks · 2018-12-24T21:32:40Z

Hello @simonjayhawkins! Thanks for updating the PR.

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

Comment last updated on December 28, 2018 at 08:45 Hours UTC

jreback · 2018-12-25T18:04:49Z

pandas/tests/resample/test_datetime_index.py


+class TestDatetimeIndex(object):


do these actually to be class based at all?

same for TDI?

jreback

looks good. some suggestions.

jreback · 2018-12-25T23:36:47Z

pandas/tests/resample/test_timedelta.py

+
+
+def test_asfreq_bug():
+    import datetime as dt


can you put the import at the top

jreback · 2018-12-25T23:37:57Z

pandas/tests/resample/test_datetime_index.py

-        funcs = ['add', 'mean', 'prod', 'ohlc', 'min', 'max', 'var']
-        for f in funcs:
-            g._cython_agg_general(f)
+    from pandas.compat import StringIO


can you put the import at the top

jreback · 2018-12-25T23:38:38Z

pandas/tests/resample/test_datetime_index.py

-                       index=dti, dtype='float64')
-        r = df.groupby(b).agg(np.sum)
+    # check all cython functions work
+    funcs = ['add', 'mean', 'prod', 'min', 'max', 'var']


can you add to the list to parameterize (future PR is ok)

I suspect this can be a fixture, as I see that list (or something similar to it) in several places.

yeah we have this as a fixture already, just need to incorporate

jreback · 2018-12-25T23:39:57Z

pandas/tests/resample/test_datetime_index.py

-            4, 9, 4, 2
-        ]}, index=date_range('2014-11-08', freq='6s', periods=4))
-        assert_frame_equal(result, expected)
+    pytest.raises(Exception, ts.asfreq, 'B')


btw ok to change these to the new format (if you want; we eventually want to fix all of these), e.g.

with pytest.raises(Exception): ts.asfreq('B')

jreback · 2018-12-25T23:41:36Z

pandas/tests/resample/test_datetime_index.py

+    assert (resampled.loc['1/1/2000 6:00:00'] == exp).all()
+
+
+def test_downsample_non_unique():


on these extra long files, ok to put in some section separators and move functions around

somthing like

# ---- # ohlc # ----

these make sense when we remove the class based testing, not super necessary but nice to have.

can you address this

There's still lots to do for this module... only a handful of tests were split or parametrised in this PR. i would prefer to move functions and add section separators as a parallel activity with the splitting and parametrizing of the remaining tests. are you OK with that?

sure, let's do after this one

jreback · 2018-12-25T23:42:28Z

pandas/tests/resample/test_time_grouper.py

@@ -79,7 +79,8 @@ def f(df):
    tm.assert_index_equal(result.index, df.index)


-@pytest.mark.filterwarnings("ignore:\\nPanel:FutureWarning")
+@pytest.mark.filterwarnings("ignore::FutureWarning")
+# @pytest.mark.filterwarnings("ignore:\\nPanel:FutureWarning")


jreback

couple of comments. ideally like to organize this and / or split to multiple files; there is a lot going on here

jreback · 2018-12-28T00:39:04Z

pandas/tests/resample/test_datetime_index.py


-        rng = date_range('1/1/2000', '12/31/2000')
-        ts = Series(np.random.randn(len(rng)), index=rng)
+def test_resample_categorical_data_with_timedeltaindex():


move to tdi tests

jreback · 2018-12-28T14:27:27Z

thanks!

…ndas-dev#24414)

simonjayhawkins added 11 commits December 21, 2018 11:42

replace setup_method with fixtures

c99d355

use index fixture for test_custom_grouper

70021bb

use series fixture for test_resample_basic

4062c25

use series fixture for test_resample_string_kwargs

b57ffae

parametrize test_resample_string_kwargs

a2049f6

use series fixture for test_resample_how

1826669

use series fixture for test_resample_how_ohlc

285aab2

parametrize test_resample_basic

731e399

parametrize test_numpy_compat

2e3d4eb

move timedelta tests to test_timedelta.py

b957006

Merge remote-tracking branch 'upstream/master' into resample-dti

525ec03

isort imports

42da1c1

mroeschke added Refactor Internal refactoring of code Testing pandas testing functions or related to the test suite labels Dec 24, 2018

jreback requested changes Dec 24, 2018

View reviewed changes

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

simonjayhawkins added 2 commits December 24, 2018 21:27

add doc-strings to fixtures

df56265

suppress FutureWarning for Panel

238911e

fix line too long warning

55e8100

jreback requested changes Dec 25, 2018

View reviewed changes

simonjayhawkins added 2 commits December 25, 2018 19:13

remove class from test_datetime_index.py

1b1aa87

remove class from test_timedelta.py

3cb5982

jreback requested changes Dec 25, 2018

View reviewed changes

jreback added the Resample resample method label Dec 25, 2018

simonjayhawkins added 4 commits December 26, 2018 08:45

hoist imports in test_datetime_index.py

137f6e8

hoist import in test_timedelta.py

37d72a7

revert suppress Panel FutureWarning

34ed69e

Merge remote-tracking branch 'upstream/master' into resample-dti

4baba7c

simonjayhawkins added 2 commits December 26, 2018 14:22

use pytest.raises as a context manager

4947d07

Merge remote-tracking branch 'upstream/master' into resample-dti

d070899

jreback requested changes Dec 28, 2018

View reviewed changes

move test to test_timedelta.py

55b3954

jreback approved these changes Dec 28, 2018

View reviewed changes

jreback merged commit 5b61eaf into pandas-dev:master Dec 28, 2018

jreback added this to the 0.24.0 milestone Dec 28, 2018

simonjayhawkins deleted the resample-dti branch December 28, 2018 15:24

Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019

REF/TST: Add more pytest idiom to resample/test_datetime_index.py (pa…

ccaaf86

…ndas-dev#24414)

Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019

REF/TST: Add more pytest idiom to resample/test_datetime_index.py (pa…

0a9033c

…ndas-dev#24414)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

REF/TST: Add more pytest idiom to resample/test_datetime_index.py #24414

REF/TST: Add more pytest idiom to resample/test_datetime_index.py #24414

simonjayhawkins commented Dec 24, 2018 •

edited

Loading

codecov bot commented Dec 24, 2018

codecov bot commented Dec 24, 2018 •

edited

Loading

pep8speaks commented Dec 24, 2018 •

edited

Loading

jreback Dec 25, 2018

jreback Dec 25, 2018

jreback left a comment

jreback Dec 25, 2018

jreback Dec 25, 2018

jreback Dec 25, 2018

gfyoung Dec 28, 2018 •

edited

Loading

jreback Dec 28, 2018

jreback Dec 25, 2018

jreback Dec 25, 2018

jreback Dec 28, 2018

simonjayhawkins Dec 28, 2018

jreback Dec 28, 2018

jreback Dec 25, 2018

jreback left a comment

jreback Dec 28, 2018

jreback commented Dec 28, 2018

		assert (resampled.loc['1/1/2000 6:00:00'] == exp).all()


		def test_downsample_non_unique():

REF/TST: Add more pytest idiom to resample/test_datetime_index.py #24414

REF/TST: Add more pytest idiom to resample/test_datetime_index.py #24414

Conversation

simonjayhawkins commented Dec 24, 2018 • edited Loading

codecov bot commented Dec 24, 2018

Codecov Report

codecov bot commented Dec 24, 2018 • edited Loading

Codecov Report

pep8speaks commented Dec 24, 2018 • edited Loading

Comment last updated on December 28, 2018 at 08:45 Hours UTC

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

gfyoung Dec 28, 2018 • edited Loading

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

jreback commented Dec 28, 2018

simonjayhawkins commented Dec 24, 2018 •

edited

Loading

codecov bot commented Dec 24, 2018 •

edited

Loading

pep8speaks commented Dec 24, 2018 •

edited

Loading

gfyoung Dec 28, 2018 •

edited

Loading