Merge pull request #37 from phobson/clearout-seaborn-dep

Clearout seaborn dependency

Author: phobson

.travis.yml

@@ -2,9 +2,6 @@ language: python
 
 matrix:
   include:
-    - python: 3.3
-      env:
-        - COVERAGE=false
     - python: 3.4
       env:
         - COVERAGE=false
@@ -27,10 +24,9 @@ install:
   - conda install --yes coverage docopt requests pyyaml
   - pip install coveralls
   - pip install .
-  - cp testing/matplotlibrc .
 
 script:
-  - nosetests --with-coverage --cover-package=paramnormal --verbose
+  - python check_paramnormal.py --with-coverage --cover-package=paramnormal --verbose
 
 after_success:
   - if [ ${COVERAGE} = true ]; then coveralls; fi

check_paramnormal.py

@@ -0,0 +1,5 @@
+import matplotlib
+matplotlib.use('agg')
+
+import nose
+nose.main()

conda.recipe/dev/bld.bat

@@ -3,27 +3,23 @@ package:
   version: v0.2.dev
 
 source:
-  git_url: https://github.com/phobson/paramnormal.git
-  git_tag: master
-#  patches:
-   # List any patch files here
-   # - fix.patch
+  path: ../..
 
 build:
   number: 1
+  script: python setup.py install
 
 requirements:
   build:
     - python
-    - numpy
-    - scipy
-    - matplotlib
+    - setuptools
 
   run:
     - python
     - numpy
     - scipy
     - matplotlib
+    - nose
 
 test:
   imports:
@@ -34,7 +30,6 @@ test:
 
   requires:
     - nose
-    - seaborn
 
 about:
   home: http://phobson.github.io/paramnormal/

conda.recipe/dev/build.sh

@@ -1,29 +1,26 @@
 package:
   name: paramnormal
-  version: v0.2.0
+  version: 0.3.0
 
 source:
   git_url: https://github.com/phobson/paramnormal.git
-  git_tag: v0.2.0
-#  patches:
-   # List any patch files here
-   # - fix.patch
+  git_tag: v0.3.0
 
 build:
   number: 1
+  script: python setup.py install
 
 requirements:
   build:
     - python
-    - numpy
-    - scipy
-    - matplotlib
+    - setuptools
 
   run:
     - python
     - numpy
     - scipy
     - matplotlib
+    - nose
 
 test:
   imports:
@@ -34,13 +31,9 @@ test:
 
   requires:
     - nose
-    - seaborn
 
 about:
   home: http://phobson.github.io/paramnormal/
   license:  BSD License
   summary: 'Conventionally parameterized probability distributions.'
 
-# See
-# http://docs.continuum.io/conda/build.html for
-# more information about meta.yaml/configure

conda.recipe/dev/meta.yaml

@@ -67,17 +67,17 @@
 
 # General information about the project.
 project = 'paramnormal'
-copyright = '2015, Paul Hobson'
+copyright = '2015 - 2016, Paul Hobson'
 author = 'Paul Hobson'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.2'
+version = '0.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.2'
+release = '0.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

conda.recipe/stable/bld.bat

@@ -1,12 +1,8 @@
 import numpy
 from matplotlib import pyplot
-try:
-    import seaborn.apionly as seaborn
-except ImportError:  # pragma: no cover
-    seaborn = None
 
-from paramnormal import dist
-from paramnormal import utils
+from . import dist
+from . import utils
 
 
 def _check_distro(distro, **params):
@@ -33,10 +29,8 @@ def _check_ax(ax):
     if ax is None:
         fig, ax = pyplot.subplots()
     else:
-        try:
-            fig = ax.figure
-        except AttributeError:
-            raise ValueError("`ax` must be None or a matplotlib Axes.")
+        ax = pyplot.gca()
+        fig = ax.figure
 
     return fig, ax
 
@@ -142,8 +136,7 @@ def _plot_pdf(distro, xlimits, ax=None, xscale='linear', **line_opts):
 
 
 def plot(distro, data=None, fit_dist=True, ax=None, pad=0.1,
-         xscale='linear', line_opts=None, distplot=False,
-         distplot_opts=None, **guesses):
+         xscale='linear', line_opts=None, **guesses):
     """
     Plot the PDF of a dataset and other representations of the
     distribution (histogram, kernel density estimate, and rug plot).
@@ -274,11 +267,4 @@ def plot(distro, data=None, fit_dist=True, ax=None, pad=0.1,
     ax = _plot_pdf(distro, xlimits, ax=ax, xscale=xscale, **line_opts)
     ax.set_xscale(xscale)
 
-    distplot_opts = dict() if not distplot_opts else distplot_opts
-    distplot_opts['kde'] = distplot_opts.pop('kde', True)
-    if distplot and data is not None and seaborn is not None:
-        seaborn.distplot(data, ax=ax, **distplot_opts)
-        if distplot_opts['kde']:
-            ax.lines[1].set_label('KDE')
-
     return ax

conda.recipe/stable/build.sh

@@ -1,53 +1,3 @@
-from warnings import simplefilter
-from numpy import errstate
 from numpy.testing import Tester
 
-class _NoseWrapper(Tester):  # pragma: no cover
-    """
-    This is simply a monkey patch for numpy.testing.Tester.
-    It allows extra_argv to be changed from its default None to ['--exe'] so
-    that the tests can be run the same across platforms.  It also takes kwargs
-    that are passed to numpy.errstate to suppress floating point warnings.
-    """
-    def test(self, label='fast', verbose=1, extra_argv=['--exe'],
-             doctests=False, coverage=False, **kwargs):
-        ''' Run tests for module using nose
-        %(test_header)s
-        doctests : boolean
-            If True, run doctests in module, default False
-        coverage : boolean
-            If True, report coverage of NumPy code, default False
-            (Requires the coverage module:
-             http://nedbatchelder.com/code/modules/coverage.html)
-        kwargs
-            Passed to numpy.errstate.  See its documentation for details.
-        '''
-
-        # cap verbosity at 3 because nose becomes *very* verbose beyond that
-        verbose = min(verbose, 3)
-
-        from numpy.testing import utils
-        utils.verbose = verbose
-
-        if doctests:
-            print("Running unit tests and doctests for %s" % self.package_name)
-        else:
-            print("Running unit tests for %s" % self.package_name)
-
-        self._show_system_info()
-
-        # reset doctest state on every run
-        import doctest
-        from numpy.testing.noseclasses import NumpyTestProgram
-
-        doctest.master = None
-
-        argv, plugins = self.prepare_test_args(label, verbose, extra_argv,
-                                               doctests, coverage)
-        with errstate(**kwargs):
-            simplefilter('ignore', category=DeprecationWarning)
-            t = NumpyTestProgram(argv=argv, exit=False, plugins=plugins)
-
-        return t.result
-
-test = _NoseWrapper().test
+test = Tester().test

conda.recipe/stable/meta.yaml

@@ -78,11 +78,6 @@ def test_ax(self):
         nt.assert_equal(ax, ax1)
         nt.assert_equal(fig, fig1)
 
-    @nt.raises(ValueError)
-    @cleanup
-    def test_error(self):
-        activity._check_ax('junk')
-
 
 class Test_random(object):
     def test_normal(self):
@@ -139,29 +134,11 @@ def test_plot_fit():
     ax2.legend()
 
 
-@image_comparison(baseline_images=['test_plot_distplot'], extensions=['png'])
-@nptest.dec.skipif(sys.version_info.minor < 4)
-@seed
-def test_plot_distplot():
-    # third
-    fig3, ax3 = pyplot.subplots()
-    data = activity.random('normal', μ=5.4, σ=2.5, shape=37)
-    ax3 = activity.plot('normal', data=data, distplot=True, ax=ax3)
-    ax3.legend(loc='upper left')
-
-
-@image_comparison(baseline_images=['test_plot_distplot_lognormal'], extensions=['png'])
+@image_comparison(baseline_images=['test_plot_xlog'], extensions=['png'])
 @nptest.dec.skipif(sys.version_info.minor < 4)
 @seed
-def test_distplot_lognormal():
-    # fourth
-    fig4, ax4 = pyplot.subplots()
-    data = activity.random('lognormal', μ=0.75, σ=1.2, shape=125)
-    logdata = numpy.log10(data)
-    bins = numpy.logspace(logdata.min(), logdata.max(), num=30)
-    distplot_opts = dict(rug=True, kde=False, norm_hist=True, bins=bins)
-    line_opts = dict(color='firebrick', lw=3.5, label='Fit PDF')
-    ax4 = activity.plot('lognormal', data=data, distplot=True,
-                        xscale='log', pad=0.01, ax=ax4,
-                        line_opts=line_opts,
-                        distplot_opts=distplot_opts)
+def test_plot_xlog():
+    # first
+    fig, ax1 = pyplot.subplots()
+    loc_dist = dist.lognormal(μ=1.25, σ=0.75)
+    ax1 = activity.plot(loc_dist, ax=ax1, xscale='log')

docs/conf.py

@@ -9,22 +9,21 @@
 DESCRIPTION = "paramnormal: Conventionally parameterized probability distributions"
 LONG_DESCRIPTION = DESCRIPTION
 NAME = "paramnormal"
-VERSION = "v0.2.0"
+VERSION = "v0.3.0"
 AUTHOR = "Paul Hobson"
 AUTHOR_EMAIL = "[email protected]"
 URL = 'http://phobson.github.io/paramnormal/'
 DOWNLOAD_URL = "https://github.com/phobson/paramnormal/archive/master.zip"
 LICENSE = "BSD 3-clause"
 PACKAGES = find_packages()
-PLATFORMS = "Python 3.3 and later."
+PLATFORMS = "Python 3.4 and later."
 CLASSIFIERS = [
     'Programming Language :: Python',
     'Operating System :: OS Independent',
     'License :: OSI Approved :: BSD License',
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Science/Research',
     'Topic :: Scientific/Engineering :: Mathematics',
-    'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
 ]