Skip to content

Commit d4461c4

Browse files
phobsonphobson
committed
new recipe, tolerances, tester fxn
1 parent 2a0986f commit d4461c4

File tree

3 files changed

+70
-18
lines changed

3 files changed

+70
-18
lines changed

‎conda.recipe/meta.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ test:
2727
- probscale
2828

2929
commands:
30-
- python -c "import matplotlib as mpl; mpl.use('agg'); import probscale as ps; ps.test()"
30+
- python -c "import sys; import matplotlib as mpl; mpl.use('agg'); import probscale as ps; sys.exit(ps.test('--mpl'))"
3131

3232
requires:
3333
- pytest
34+
- pytest-mpl
3435
- scipy
3536

3637
about:

‎probscale/tests/test_probscale.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,10 @@ def test_minimal_norm_cdf(mn, mn_input):
7070
assert numpy.all(numpy.abs(diff) < 0.001)
7171

7272

73-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_probscale')
73+
@pytest.mark.mpl_image_compare(
74+
baseline_dir='baseline_images/test_probscale',
75+
tolerance=15
76+
)
7477
@pytest.mark.skipif(PYTHON27, reason="legacy python")
7578
def test_the_scale_default():
7679
fig, ax = plt.subplots(figsize=(4, 8))
@@ -80,15 +83,21 @@ def test_the_scale_default():
8083
return fig
8184

8285

83-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_probscale')
86+
@pytest.mark.mpl_image_compare(
87+
baseline_dir='baseline_images/test_probscale',
88+
tolerance=15
89+
)
8490
def test_the_scale_not_as_pct():
8591
fig, ax = plt.subplots(figsize=(4, 8))
8692
ax.set_yscale('prob', as_pct=False)
8793
ax.set_ylim(0.02, 0.98)
8894
return fig
8995

9096

91-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_probscale')
97+
@pytest.mark.mpl_image_compare(
98+
baseline_dir='baseline_images/test_probscale',
99+
tolerance=13
100+
)
92101
@pytest.mark.skipif(stats is None, reason="scipy not installed")
93102
def test_the_scale_beta():
94103
fig, ax = plt.subplots(figsize=(4, 8))

‎probscale/tests/test_viz.py

Lines changed: 56 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -367,23 +367,32 @@ def plot_data():
367367
return data
368368

369369

370-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
370+
@pytest.mark.mpl_image_compare(
371+
baseline_dir='baseline_images/test_viz',
372+
tolerance=10
373+
)
371374
def test_probplot_prob(plot_data):
372375
fig, ax = plt.subplots()
373376
fig = viz.probplot(plot_data, ax=ax, xlabel='Test xlabel', datascale='log')
374377
assert isinstance(fig, plt.Figure)
375378
return fig
376379

377380

378-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
381+
@pytest.mark.mpl_image_compare(
382+
baseline_dir='baseline_images/test_viz',
383+
tolerance=10
384+
)
379385
def test_probplot_qq(plot_data):
380386
fig, ax = plt.subplots()
381387
fig = viz.probplot(plot_data, ax=ax, plottype='qq', ylabel='Test label',
382388
datascale='log', scatter_kws=dict(color='r'))
383389
return fig
384390

385391

386-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
392+
@pytest.mark.mpl_image_compare(
393+
baseline_dir='baseline_images/test_viz',
394+
tolerance=10
395+
)
387396
def test_probplot_pp(plot_data):
388397
fig, ax = plt.subplots()
389398
scatter_kws = dict(color='b', linestyle='--', markeredgecolor='g', markerfacecolor='none')
@@ -392,23 +401,32 @@ def test_probplot_pp(plot_data):
392401
return fig
393402

394403

395-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
404+
@pytest.mark.mpl_image_compare(
405+
baseline_dir='baseline_images/test_viz',
406+
tolerance=10
407+
)
396408
def test_probplot_prob_bestfit(plot_data):
397409
fig, ax = plt.subplots()
398410
fig = viz.probplot(plot_data, ax=ax, xlabel='Test xlabel', bestfit=True, datascale='log')
399411
assert isinstance(fig, plt.Figure)
400412
return fig
401413

402414

403-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
415+
@pytest.mark.mpl_image_compare(
416+
baseline_dir='baseline_images/test_viz',
417+
tolerance=10
418+
)
404419
def test_probplot_qq_bestfit(plot_data):
405420
fig, ax = plt.subplots()
406421
fig = viz.probplot(plot_data, ax=ax, plottype='qq', bestfit=True,
407422
ylabel='Test label', datascale='log')
408423
return fig
409424

410425

411-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
426+
@pytest.mark.mpl_image_compare(
427+
baseline_dir='baseline_images/test_viz',
428+
tolerance=10
429+
)
412430
def test_probplot_pp_bestfit(plot_data):
413431
fig, ax = plt.subplots()
414432
scatter_kws = {'marker': 's', 'color': 'red'}
@@ -419,23 +437,32 @@ def test_probplot_pp_bestfit(plot_data):
419437
return fig
420438

421439

422-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
440+
@pytest.mark.mpl_image_compare(
441+
baseline_dir='baseline_images/test_viz',
442+
tolerance=10
443+
)
423444
def test_probplot_prob_probax_y(plot_data):
424445
fig, ax = plt.subplots()
425446
fig = viz.probplot(plot_data, ax=ax, xlabel='Test xlabel', datascale='log', probax='y')
426447
assert isinstance(fig, plt.Figure)
427448
return fig
428449

429450

430-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
451+
@pytest.mark.mpl_image_compare(
452+
baseline_dir='baseline_images/test_viz',
453+
tolerance=10
454+
)
431455
def test_probplot_qq_probax_y(plot_data):
432456
fig, ax = plt.subplots()
433457
fig = viz.probplot(plot_data, ax=ax, plottype='qq', ylabel='Test label', probax='y',
434458
datascale='log', scatter_kws=dict(color='r'))
435459
return fig
436460

437461

438-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
462+
@pytest.mark.mpl_image_compare(
463+
baseline_dir='baseline_images/test_viz',
464+
tolerance=10
465+
)
439466
def test_probplot_pp_probax_y(plot_data):
440467
fig, ax = plt.subplots()
441468
scatter_kws = dict(color='b', linestyle='--', markeredgecolor='g', markerfacecolor='none')
@@ -444,7 +471,10 @@ def test_probplot_pp_probax_y(plot_data):
444471
return fig
445472

446473

447-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
474+
@pytest.mark.mpl_image_compare(
475+
baseline_dir='baseline_images/test_viz',
476+
tolerance=10
477+
)
448478
def test_probplot_prob_bestfit_probax_y(plot_data):
449479
fig, ax = plt.subplots()
450480
fig = viz.probplot(plot_data, ax=ax, xlabel='Test xlabel', bestfit=True,
@@ -453,15 +483,21 @@ def test_probplot_prob_bestfit_probax_y(plot_data):
453483
return fig
454484

455485

456-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
486+
@pytest.mark.mpl_image_compare(
487+
baseline_dir='baseline_images/test_viz',
488+
tolerance=10
489+
)
457490
def test_probplot_qq_bestfit_probax_y(plot_data):
458491
fig, ax = plt.subplots()
459492
fig = viz.probplot(plot_data, ax=ax, plottype='qq', bestfit=True, ylabel='Test label',
460493
datascale='log', probax='y')
461494
return fig
462495

463496

464-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
497+
@pytest.mark.mpl_image_compare(
498+
baseline_dir='baseline_images/test_viz',
499+
tolerance=10
500+
)
465501
def test_probplot_pp_bestfit_probax_y(plot_data):
466502
fig, ax = plt.subplots()
467503
scatter_kws = {'marker': 's', 'color': 'red'}
@@ -472,7 +508,10 @@ def test_probplot_pp_bestfit_probax_y(plot_data):
472508
return fig
473509

474510

475-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
511+
@pytest.mark.mpl_image_compare(
512+
baseline_dir='baseline_images/test_viz',
513+
tolerance=15
514+
)
476515
@pytest.mark.skipif(stats is None, reason="no scipy")
477516
def test_probplot_beta_dist_best_fit_y(plot_data):
478517
fig, (ax1, ax2) = plt.subplots(ncols=2)
@@ -489,7 +528,10 @@ def test_probplot_beta_dist_best_fit_y(plot_data):
489528
return fig
490529

491530

492-
@pytest.mark.mpl_image_compare(baseline_dir='baseline_images/test_viz')
531+
@pytest.mark.mpl_image_compare(
532+
baseline_dir='baseline_images/test_viz',
533+
tolerance=10
534+
)
493535
@pytest.mark.skipif(stats is None, reason="no scipy")
494536
def test_probplot_beta_dist_best_fit_x(plot_data):
495537
fig, (ax1, ax2) = plt.subplots(nrows=2)

0 commit comments

Comments
 (0)