Merge pull request #45 from phobson/mpl20-py36

add python 3.6 to build, new mpl2.0 images

.codeclimate.yml

@@ -3,4 +3,5 @@ languages:
 exclude_paths:
 - "docs/*"
 - "docs/*/*"
+- "paramnormal/tests/*"
 - "conda.recipe/*"

.travis.yml

@@ -6,6 +6,9 @@ matrix:
       env:
         - COVERAGE=false
     - python: 3.5
+      env:
+        - COVERAGE=false
+    - python: 3.6
       env:
         - COVERAGE=true
 

paramnormal/tests/__init__.py

@@ -4,7 +4,13 @@
 
 import paramnormal
 
+
 def test(*args):
+    try:
+        import pytest
+    except ImportError as e:
+        raise ImportError("`pytest` is required to run the test suite")
+
     options = [resource_filename('paramnormal', 'tests')]
     options.extend(list(args))
-    return pytest.main(options)
+    return pytest.main(options)

paramnormal/tests/test_activity.py

@@ -12,6 +12,7 @@
 
 
 BASELINE_DIR = 'baseline_images/test_activity'
+TOLERANCE = 15
 
 
 def assert_dists_are_equivalent(dist1, dist2):
@@ -109,7 +110,7 @@ def test_create_normal():
     assert_dists_are_equivalent(dist, stats.norm(params.mu, params.sigma))
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_pdf_basic():
     # first
@@ -119,7 +120,7 @@ def test_plot_pdf_basic():
     return fig
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_pdf_fit():
     # second
@@ -132,7 +133,7 @@ def test_plot_pdf_fit():
     return fig2
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_pdf_xlog():
     # first
@@ -142,7 +143,7 @@ def test_plot_pdf_xlog():
     return fig
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_cdf_basic():
     # first
@@ -152,7 +153,7 @@ def test_plot_cdf_basic():
     return fig
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_cdf_fit():
     # second
@@ -165,7 +166,7 @@ def test_plot_cdf_fit():
     return fig2
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_cdf_xlog():
     # first
@@ -176,7 +177,7 @@ def test_plot_cdf_xlog():
     return fig
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_sf_basic():
     # first
@@ -186,7 +187,7 @@ def test_plot_sf_basic():
     return fig
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_sf_fit():
     # second
@@ -199,7 +200,7 @@ def test_plot_sf_fit():
     return fig2
 
 
-@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=15)
+@pytest.mark.mpl_image_compare(baseline_dir=BASELINE_DIR, tolerance=TOLERANCE)
 @seed
 def test_plot_sf_xlog():
     # first

readme.rst

@@ -6,10 +6,6 @@ paramnormal: Conventionally parameterized probability distributions
 .. image:: https://coveralls.io/repos/phobson/paramnormal/badge.svg?branch=master&service=github
   :target: https://coveralls.io/github/phobson/paramnormal?branch=master
 
-.. image:: https://codeclimate.com/github/phobson/paramnormal/badges/gpa.svg
-   :target: https://codeclimate.com/github/phobson/paramnormal
-   :alt: Code Climate
-
 
 Scipy distributions are weird.
 Maybe these will be less weird.

setup.py

@@ -26,6 +26,7 @@
     'Topic :: Scientific/Engineering :: Mathematics',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
 ]
 INSTALL_REQUIRES = ['numpy', 'scipy', 'matplotlib']
 PACKAGE_DATA = {