REF/TST: Add more pytest idiom to resample/test_base.py #24377

simonjayhawkins · 2018-12-20T19:33:28Z

[ 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

in this pass:

alternative approach to REF/TST: Add more pytest idiom to resample/test_base.py #24324
parametrize base class tests individually to avoid changing fixtures

cc @jreback

pep8speaks · 2018-12-20T19:33:30Z

Hello @simonjayhawkins! Thanks for updating the PR.

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

Comment last updated on December 23, 2018 at 19:07 Hours UTC

codecov · 2018-12-20T20:16:57Z

Codecov Report

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

@@           Coverage Diff           @@
##           master   #24377   +/-   ##
=======================================
  Coverage   92.29%   92.29%           
=======================================
  Files         162      162           
  Lines       51841    51841           
=======================================
  Hits        47847    47847           
  Misses       3994     3994

Flag	Coverage Δ
#multiple	`90.7% <ø> (ø)`	⬆️
#single	`42.98% <ø> (ø)`	⬆️

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 5d134ec...dceb8bc. Read the comment docs.

codecov · 2018-12-20T20:17:01Z

Codecov Report

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

@@            Coverage Diff             @@
##           master   #24377      +/-   ##
==========================================
- Coverage    92.3%    92.3%   -0.01%     
==========================================
  Files         162      163       +1     
  Lines       51875    51947      +72     
==========================================
+ Hits        47883    47949      +66     
- Misses       3992     3998       +6

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

Impacted Files	Coverage Δ
pandas/core/arrays/datetimes.py	`97.77% <0%> (-0.47%)`	⬇️
pandas/core/arrays/timedeltas.py	`86.85% <0%> (-0.31%)`	⬇️
pandas/core/arrays/datetimelike.py	`96.35% <0%> (-0.16%)`	⬇️
pandas/core/indexes/timedeltas.py	`90.42% <0%> (-0.03%)`	⬇️
pandas/core/arrays/period.py	`98.49% <0%> (-0.01%)`	⬇️
pandas/core/indexes/datetimes.py	`96.33% <0%> (-0.01%)`	⬇️
pandas/core/indexes/base.py	`96.27% <0%> (ø)`	⬆️
pandas/core/arrays/_ranges.py	`98.66% <0%> (ø)`
pandas/core/indexes/datetimelike.py	`97.29% <0%> (ø)`	⬆️
pandas/core/tools/datetimes.py	`85.32% <0%> (+0.04%)`	⬆️
... and 1 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 3e0358d...f7092c2. Read the comment docs.

jreback

need to look some more

jreback · 2018-12-21T16:33:04Z

pandas/tests/resample/test_base.py

+
+
+@pytest.mark.parametrize(
+    '_index_factory,_series_name,_index_start,_index_end',


this is slightly magical

jreback

looks good. on master we have 499 tests and 139 skipped, here 497 ad 9 skipped. so I think a couple got removed?

jreback · 2018-12-23T15:42:05Z

pandas/tests/resample/test_base.py

@@ -19,6 +17,22 @@
    assert_almost_equal, assert_frame_equal, assert_index_equal,
    assert_series_equal)

+# tuples of '_index_factory,_series_name,_index_start,_index_end'


can you give a little more expl here on what this actuall does

simonjayhawkins · 2018-12-23T17:52:18Z

@jreback

on master we have 499 tests and 139 skipped, here 497 ad 9 skipped. so I think a couple got removed?

for TestDatetimeIndex::test_resample_empty_dtypes

$ pytest pandas/tests/resample/test_base.py::TestDatetimeIndex::test_resample_empty_dtypes
============================= test session starts =============================
platform win32 -- Python 3.6.6, pytest-3.7.3, py-1.5.4, pluggy-0.7.1
rootdir: C:\Users\simon\OneDrive\code\pandas-simonjayhawkins, inifile: setup.cfg
plugins: xdist-1.23.0, forked-0.2, cov-2.5.1, hypothesis-3.59.1
collected 192 items

pandas\tests\resample\test_base.py ..................................... [ 19%]
........................................................................ [ 56%]
........................................................................ [ 94%]
...........                                                              [100%]

========================= 192 passed in 1.55 seconds ==========================

similarly for TestPeriodIndex

$ pytest pandas/tests/resample/test_base.py::TestPeriodIndex::test_resample_empty_dtypes
============================= test session starts =============================
platform win32 -- Python 3.6.6, pytest-3.7.3, py-1.5.4, pluggy-0.7.1
rootdir: C:\Users\simon\OneDrive\code\pandas-simonjayhawkins, inifile: setup.cfg
plugins: xdist-1.23.0, forked-0.2, cov-2.5.1, hypothesis-3.59.1
collected 192 items

pandas\tests\resample\test_base.py ..................................... [ 19%]
........................................................................ [ 56%]
........................................................................ [ 94%]
...........                                                              [100%]

========================= 192 passed in 1.10 seconds ==========================

and the same for TestTimedeltaIndex

but because test_resample_empty_dtypes is paramatrized using a generator it was misbehaving..

$ pytest pandas/tests/resample/test_base.py -k test_resample_empty_dtypes
============================= test session starts =============================
platform win32 -- Python 3.6.6, pytest-3.7.3, py-1.5.4, pluggy-0.7.1
rootdir: C:\Users\simon\OneDrive\code\pandas-simonjayhawkins, inifile: setup.cfg
plugins: xdist-1.23.0, forked-0.2, cov-2.5.1, hypothesis-3.59.1
collected 638 items / 318 deselected

pandas\tests\resample\test_base.py ..................................... [ 11%]
........................................................................ [ 34%]
........................................................................ [ 56%]
...........sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss [ 79%]
sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss      [100%]

=========== 192 passed, 128 skipped, 318 deselected in 1.43 seconds ===========

so that account for 128 of the 130 reduction in skipped tests. the other two are from the overridden tests...

pandas/pandas/tests/resample/test_base.py

Lines 231 to 237 in 1cd077a

    
           @pytest.mark.skip() 
        
           def test_asfreq(self): 
        
               pass 
        
           @pytest.mark.skip() 
        
           def test_asfreq_fill_value(self): 
        
               pass

the number of passed tests is reduced by two since test_raises_on_non_datetimelike_index is not dependent on index type so is now only run once instead of 3 times.

pandas/pandas/tests/resample/test_base.py

Lines 71 to 74 in 1cd077a

    
           def test_raises_on_non_datetimelike_index(self): 
        
               # this is a non datetimelike index 
        
               xp = DataFrame() 
        
               pytest.raises(TypeError, lambda: xp.resample('A').mean())

jreback · 2018-12-23T19:08:55Z

_____________ ERROR collecting pandas/tests/resample/test_base.py _____________
2018-12-23T18:59:10.6286537Z C:\Miniconda\envs\pandas-dev\lib\site-packages\_pytest\python.py:450: in _importtestmodule
2018-12-23T18:59:10.6287402Z     mod = self.fspath.pyimport(ensuresyspath=importmode)
2018-12-23T18:59:10.6287666Z C:\Miniconda\envs\pandas-dev\lib\site-packages\py\_path\local.py:668: in pyimport
2018-12-23T18:59:10.6287846Z     __import__(modname)
2018-12-23T18:59:10.6288006Z E     File "D:\a\1\s\pandas\tests\resample\test_base.py", line 21
2018-12-23T18:59:10.6288224Z E   SyntaxError: Non-ASCII character '\xe2' in file D:\a\1\s\pandas\tests\resample\test_base.py on line 21, but no encoding declared; see http://python.org/dev/peps/pep-0263/ for details
2018-12-23T18:59:10.629434

jreback · 2018-12-23T23:06:04Z

thanks @simonjayhawkins

…4377)

parametrize base class tests individually

dceb8bc

reduce duplication

d8c71ab

jreback requested changes Dec 21, 2018

View reviewed changes

jreback added Testing pandas testing functions or related to the test suite Resample resample method labels Dec 21, 2018

simonjayhawkins added 5 commits December 22, 2018 18:40

add pytest_generate_tests

d818b84

use frame fixture

9b32091

create empty_series fixture

c25b33c

create empty_frame fixture

3a8d8b1

Merge remote-tracking branch 'upstream/master' into resample-base-alt

4e110bb

jreback requested changes Dec 23, 2018

View reviewed changes

simonjayhawkins added 2 commits December 23, 2018 18:24

add code comment

6da8252

replace non-ASCII characters

f7092c2

jreback added this to the 0.24.0 milestone Dec 23, 2018

jreback approved these changes Dec 23, 2018

View reviewed changes

jreback merged commit 0d2cd53 into pandas-dev:master Dec 23, 2018

simonjayhawkins deleted the resample-base-alt branch December 24, 2018 08:46

simonjayhawkins mentioned this pull request Feb 11, 2019

REF/TST: resample/test_base.py #25262

Merged

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

REF/TST: Add more pytest idiom to resample/test_base.py (pandas-dev#2…

00a5530

…4377)

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

REF/TST: Add more pytest idiom to resample/test_base.py (pandas-dev#2…

f5e8b56

…4377)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

REF/TST: Add more pytest idiom to resample/test_base.py #24377

REF/TST: Add more pytest idiom to resample/test_base.py #24377

simonjayhawkins commented Dec 20, 2018 •

edited

Loading

pep8speaks commented Dec 20, 2018 •

edited

Loading

codecov bot commented Dec 20, 2018

codecov bot commented Dec 20, 2018 •

edited

Loading

jreback left a comment

jreback Dec 21, 2018

jreback left a comment

jreback Dec 23, 2018

simonjayhawkins commented Dec 23, 2018

jreback commented Dec 23, 2018

jreback commented Dec 23, 2018



		@pytest.mark.parametrize(
		'_index_factory,_series_name,_index_start,_index_end',

REF/TST: Add more pytest idiom to resample/test_base.py #24377

REF/TST: Add more pytest idiom to resample/test_base.py #24377

Conversation

simonjayhawkins commented Dec 20, 2018 • edited Loading

pep8speaks commented Dec 20, 2018 • edited Loading

Comment last updated on December 23, 2018 at 19:07 Hours UTC

codecov bot commented Dec 20, 2018

Codecov Report

codecov bot commented Dec 20, 2018 • edited Loading

Codecov Report

jreback left a comment

Choose a reason for hiding this comment

jreback Dec 21, 2018

Choose a reason for hiding this comment

jreback left a comment

Choose a reason for hiding this comment

jreback Dec 23, 2018

Choose a reason for hiding this comment

simonjayhawkins commented Dec 23, 2018

jreback commented Dec 23, 2018

jreback commented Dec 23, 2018

simonjayhawkins commented Dec 20, 2018 •

edited

Loading

pep8speaks commented Dec 20, 2018 •

edited

Loading

codecov bot commented Dec 20, 2018 •

edited

Loading