commit d9736c0478effd9c30b177dbda90918186f97623
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Wed Dec 12 12:17:22 2018 -0600

    Add patches for v0.14.1
    
    - Mark some tests as xfail if numpy uses mkl (precision issues)
    - Fix compatibility with pytest >=4
    - Add patch for fixing test on ppc64le and arm

commit 7e76c3ce274ccf32a07aaa90e2da58d34f283f75
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Fri May 4 20:59:40 2018 +0000

    Python 3.7 compat: Build from github tag so cython is re-run
    
    We want to force Cython to be re-run not just because it's necessary when the internal
    Python structures are re-arranged (as can happen at every minor release) but also so
    that new optimations in Cython (such as those addressing https://github.com/cython/cython/issues/2102
    ) are not left on the table

commit 8722f65d61ad25f7d88f7aac846bf17b5c522b4b
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Nov 22 10:17:18 2017 -0600

    add license_family

commit 9b551f3c03adfb0d165270f831621640b163300a
Author: Michael Sarahan <msarahan@gmail.com>
Date:   Fri Sep 22 12:07:50 2017 -0500

    add in host appropriately, don't use pip (access violation on win32 vs2015)

commit dc986778e499fa090f219cc1afe3bc3d02990d81
Author: Mark Harfouche <mark.harfouche@gmail.com>
Date:   Wed Nov 7 18:19:40 2018 -0500

    MNT: Remove double dependency on dask (#33)
    
    - Remove build dep on numpy doc
    - Add cytoolz as a dependency for speed
    - Update build command

commit 08d05b6ea572a6031d3fe360e37d6489da036b4e
Merge: 928d79c 3782efa
Author: Filipe <ocefpaf@gmail.com>
Date:   Sun Oct 21 11:16:01 2018 -0300

    Merge pull request #35 from Korijn/leave-maintainers
    
    leave-maintainers

commit 3782efa240aa2734e88d365fa26251e06df6de5c
Author: Korijn van Golen <korijn@gmail.com>
Date:   Sun Oct 21 15:50:15 2018 +0200

    Update meta.yaml

commit 928d79c52b9d5c9a2385481b3d30e57f7750d901
Merge: 4182fe8 0916067
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat Oct 13 16:56:49 2018 -0400

    Merge pull request #34 from regro-cf-autotick-bot/rebuild
    
    Rebuild for Python 3.7, GCC 7, R 3.5.1, openBLAS 0.3.2

commit 0916067baf7bf86cdfdce1be2b6a606f25259adc
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sat Oct 13 08:57:48 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.11

commit ae67f68af4e8cb2aca2ffdbde2304f85b2f4e5f2
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sat Oct 13 08:57:43 2018 +0000

    bump build number

commit 4182fe8b7aa4bb6df5d9bde66e3d3e95b739c2f8
Merge: 7825982 f2c736c
Author: Juan Nunez-Iglesias <juan.nunez-iglesias@monash.edu>
Date:   Tue Oct 2 20:50:42 2018 +1000

    Merge pull request #31 from regro-cf-autotick-bot/0.14.1
    
    update scikit-image to v0.14.1

commit f2c736c3b46c485b07fbdf15b7424c734b621f53
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Tue Oct 2 09:15:54 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.01

commit f45c1e5d53bd3c171e4f766f29baa9477e5fbdf0
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Tue Oct 2 09:15:30 2018 +0000

    updated v0.14.1

commit 7825982d27a697b605bfd2330dd792a4d641931f
Merge: 77e0aa9 0a8c50f
Author: Filipe <ocefpaf@gmail.com>
Date:   Wed Sep 12 16:40:33 2018 -0300

    Merge pull request #28 from hmaarrfk/run_test_with_command
    
    Remove test script in favour of running pytest directly

commit 77e0aa9388e17e9b82bc24e5f5c03268ea3e5b94
Author: Travis CI User <travis@example.org>
Date:   Sat Aug 4 17:16:06 2018 +0000

    [ci skip] [skip ci] Update anaconda token

commit 0a8c50fe0d59a745fa436a8bd9bd4b17f22dd238
Author: Mark Harfouche <mark.harfouche@gmail.com>
Date:   Tue Jul 24 11:16:55 2018 -0400

    Does mac support Agg?

commit 2af807c78f669a2e6bf92adf1423a74f59618a67
Author: Mark Harfouche <mark.harfouche@gmail.com>
Date:   Tue Jul 24 07:32:41 2018 -0700

    Use different environment variables per OS

commit cf8046dabe196df60c5fdf63425ea116ab193919
Author: Mark Harfouche <mark.harfouche@gmail.com>
Date:   Tue Jul 24 08:36:11 2018 -0400

    Environment variables?

commit ba3091328fa91d6d463e386aae2bd432557034ab
Author: Mark Harfouche <mark.harfouche@gmail.com>
Date:   Mon Jul 23 20:41:01 2018 -0400

    Remove test script in favour of running pytest directly
    
    - call the test with the pytest command
    - Use an environment variable to set the matplotlib backend
    - revert the build number
    - Build number set to 1 because nothing actually changes in the installed
    files

commit 6d9699ec37588391450d04f6a116701f0d375c0a
Merge: a5db9ee 74a4cf2
Author: Juan Nunez-Iglesias <jni.soma@gmail.com>
Date:   Thu May 31 23:48:05 2018 -0700

    Merge pull request #22 from jakirkham-feedstocks/drop_unneeded_selector
    
    Drop unneeded selector  [ci skip]

commit 74a4cf22f67a6eb3c7a574c22206dbe0c99c5347
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 30 14:32:38 2018 -0700

    Drop unneeded selector  [ci skip]
    
    This didn't do anything as we don't support Windows 32-bit any more.
    However it really shouldn't have been there either. Hence we drop this
    selector.

commit a5db9eefc461e11f5ab8250232cc06ca17636d5c
Merge: 67eba96 ce8df0d
Author: Juan Nunez-Iglesias <jni.soma@gmail.com>
Date:   Wed May 30 14:29:28 2018 -0700

    Merge pull request #21 from conda-forge-linter/conda_forge_admin_20
    
    conda-build 3 support

commit ce8df0d56a20f84235cea9ffaed7a7bdf1160187
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 30 10:36:00 2018 -0700

    Bump build number to 1
    
    Now that we have made some changes to the build for `conda-build` 3
    (e.g. using the compiler syntax), bump the build number to get fresh
    packages.

commit 7a1a40f516a64aadfdc38902dabde097ccfe390e
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 30 10:35:11 2018 -0700

    Switch to building the package with pip
    
    As `pip` is now the preferred way to build Python packages in
    conda-forge, switch over to using `pip`.

commit 8a2d6c81a7c2052e8129380424df2921531d381b
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 30 10:31:19 2018 -0700

    Drop `conda inspect` commands in tests
    
    These are already run (effectively) by `conda-build` 3. So there is no
    need to have these commands here. Plus they are planned for deprecation.
    Given this, we go ahead and drop them here.

commit 827f0e53c77ec167f82844e5be777022647e04ee
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Wed May 30 17:25:22 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.5 and pinning 2018.05.22

commit a2544f7aea6b9dc8f30186ee14e9d07cd73f746a
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 30 10:23:39 2018 -0700

    Drop `headerpad_max_install_names` flag on macOS
    
    This is already set by the compilers on macOS.

commit 61dd33b1ae1e82e94e15d47bbc42c40a6a66460a
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 30 10:23:12 2018 -0700

    Use new `numpy` pinning syntax

commit 4e8920ccc2353cfae5197c9da825858923bdfd19
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 30 10:16:05 2018 -0700

    MNT: Re-rendered with conda-smithy 3.1.5 and pinning 2018.05.22
    
    Now that the compilers are in use, re-render to update the build
    configurations accordingly.

commit 4fdaf5150bf05b3d506088d5f538acd52eb574a3
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 30 10:14:47 2018 -0700

    Use the new compiler syntax
    
    Makes use of the new compiler syntax and the `build`/`host` split.

commit 061d4c73ca73ec5e7edfddbf9e3ed40d86fd8cc5
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Tue May 29 18:41:06 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.5 and pinning 2018.05.22

commit 67eba96e738beadb348c0382a2b2dde16d732729
Merge: 7f2190d c714ab6
Author: jakirkham <jakirkham@gmail.com>
Date:   Tue May 29 11:06:46 2018 -0700

    Merge pull request #18 from soupault/v0.14.0
    
    Update the recipe to 0.14.0

commit c714ab662a92382b9ef0740666f9583aec6a9120
Author: Egor Panfilov <egor.v.panfilov@gmail.com>
Date:   Tue May 29 16:03:03 2018 +0300

    Fix dask dependency

commit be7931cf435fb07df20070f451ceabbae3bc5502
Author: Egor Panfilov <egor.v.panfilov@gmail.com>
Date:   Tue May 29 12:22:20 2018 +0300

    Update the recipe to 0.14

commit 7f2190d3940f7607b30fe432dee4925a66f4a7e8
Merge: d137e6d fb95218
Author: Korijn van Golen <korijn@gmail.com>
Date:   Thu Dec 14 10:00:48 2017 +0100

    Merge pull request #16 from carlodri/patch-1
    
    bumping to 0.13.1

commit fb9521852d11c1c744828b78593961c09bcbe53c
Author: Carlo Dri <carlodri@users.noreply.github.com>
Date:   Sat Dec 9 23:34:27 2017 +0100

    allow networkx 2.0

commit 197532fc653f4d143415e2105d8e004c9ceb25cc
Author: Carlo Dri <carlodri@users.noreply.github.com>
Date:   Sat Dec 9 23:33:46 2017 +0100

    reset build number to 0

commit 2dbce8004e31800a67cd7ed414c53a9f7743fc97
Author: Carlo Dri <carlodri@users.noreply.github.com>
Date:   Thu Dec 7 12:30:11 2017 +0100

    bumping to 0.13.1

commit d137e6d81e2437ad2615e293e6e68762627e9045
Merge: 0e07552 ad9964d
Author: jakirkham <jakirkham@gmail.com>
Date:   Wed Nov 1 00:22:55 2017 -0400

    Merge pull request #15 from jni/nxlimit
    
    Ensure v0.13.0 not installed with nx 2.0

commit ad9964d4e4c22808101366fd40883802aa7742de
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Thu Oct 26 18:54:15 2017 +1100

    Use setup.py directly

commit 6d6918cba96bade63d481022d241e509f5af2b5e
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 16 17:17:07 2017 +1100

    Make test runs verbose

commit 3c479c094f03f1966449ba8863e37f20ba66bc28
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Fri Oct 13 17:59:40 2017 +1100

    Skip viewer tests, remove Qt dependence

commit 22145f876d006da64d4b61ee08bd745feef6502a
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Oct 4 18:45:08 2017 +1100

    Use correct rcParams key

commit f68b6eb42cd5a1f1754b654a1c2cbbdac164fc71
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Oct 4 16:45:28 2017 +1100

    Use correct name for test running script

commit 42102d02b2347e36fa4b3fcd2bcd8bc0cd900eae
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Oct 4 11:46:37 2017 +1100

    Move run_tests into recipe dir

commit e5eabbb4f8bfbc44d307f46170669c98ba4d5d9c
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Oct 4 10:41:44 2017 +1100

    Add run tests script, skipping viewer tests on Windows

commit 12d6cacda0ebfe1a4d2ee482216ad98c25129ac7
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Tue Oct 3 00:50:27 2017 +1100

    Here goes nothing...

commit 67cfa9a16fd21d496e9db691641c9f60f6fc3d92
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 2 20:45:57 2017 +1100

    Use Qt5 platform 'offscreen' for testing

commit f4a5f7471fd85ec1262ae6113bc7c2abae670936
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 2 20:12:30 2017 +1100

    Delete errant script in skimage source tarball

commit daf5a61822f730db24411098c329a21019169a60
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 2 18:58:12 2017 +1100

    Ensure Pillow <4.2 for testing 0.13
    
    The novice module, removed in 0.14.x, runs into this error:
    https://github.com/python-pillow/Pillow/issues/2609

commit 2bdc7feb1fce52f2e6e55eb99b15cfbd80512b8a
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 2 17:37:22 2017 +1100

    Set matplotlib backend to avoid display issues

commit 663fa9ee47f2e826f854d15cf7b85d211a4b3b06
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 2 16:12:33 2017 +1100

    I swear I'm not new at this

commit 362c2076f455cd561f97ab258f92c48815d9c896
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 2 15:11:40 2017 +1100

    Add early stopping and stdout printing to nosetests

commit 04c82301c1ca30e66f0ba8743bcf2af930d02ffb
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 2 15:09:10 2017 +1100

    Replace too-new pytest with nosetests

commit a45bec712b91559f54924a9d4e7b6bc70db76b13
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Mon Oct 2 00:27:01 2017 +1100

    Use correct call for pytest

commit e75c0096e8f9f53bd566a9accf7bd68b2c25f62b
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Sun Oct 1 17:13:23 2017 +1100

    Add pytest to recipe

commit 8ef9d41ffb5a279e7be35034d3f9aea063f0491f
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Thu Sep 28 19:49:55 2017 +1000

    Ensure v0.13.0 not installed with nx 2.0

commit 0e07552a29ac7ebb11fae61b111dc7ddb80f3aec
Merge: d8f61ef 54c0535
Author: jakirkham <jakirkham@gmail.com>
Date:   Thu Sep 28 01:22:06 2017 -0400

    Merge pull request #14 from jni/dask-core
    
    Clean up dependencies by using dask-core

commit 54c0535a051229dbcc359550da207a41d4c68911
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Sep 27 15:00:48 2017 +1000

    Use earlier toolz as minimum requirement

commit 9e64be463e65aed5ae694913a8989f680ef0d26f
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Tue Sep 26 17:37:16 2017 +1000

    Clean up dependencies by using dask-core

commit d8f61efd15a81dd0c524f6f6157d4665c6fe1a60
Merge: e3722e9 82983a2
Author: jakirkham <jakirkham@gmail.com>
Date:   Thu Sep 14 00:08:05 2017 -0400

    Merge pull request #13 from jakirkham-feedstocks/re-render__master__2.4.0
    
    MNT: Re-rendered with conda-smithy 2.4.0 [ci skip]

commit 82983a2e87ee6152a9e5de853c879da3abf66862
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed Sep 13 13:29:40 2017 -0400

    MNT: Re-rendered with conda-smithy 2.4.0

commit e3722e9327b86543b0771be710326e112af59071
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat Aug 26 19:42:14 2017 +0000

    [ci skip] [skip ci] Update anaconda token

commit 290a786e4e512108df4c6c69deb2428f0df5dfd8
Merge: 7111e2e 51db456
Author: Filipe <ocefpaf@gmail.com>
Date:   Thu Jul 27 20:20:12 2017 -0300

    Merge pull request #12 from ocefpaf/sane_numpy
    
    Sane numpy

commit 51db4560eab45190d646524e30bc0b5612ec2665
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Jul 27 10:17:36 2017 -0300

    sane numpy matrix and single build file

commit 7111e2e5ed1692a063b8089506a45ffbeb27e746
Merge: 65f91cb 5c82f78
Author: Juan Nunez-Iglesias <jni.soma@gmail.com>
Date:   Fri Jun 9 19:09:32 2017 +1000

    Merge pull request #11 from jakirkham/use_np_113
    
    Add NumPy 1.13

commit 5c82f78a12b26909cfce5bf4409154097efe0797
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Jun 9 01:46:36 2017 -0400

    MNT: Re-rendered with conda-smithy 2.3.1
    
    Re-render to add NumPy 1.13 to the CI matrices.

commit 65f91cb51b932dea97098c0f5bda70677157f00c
Merge: 55fe335 976bd2a
Author: Juan Nunez-Iglesias <jni.soma@gmail.com>
Date:   Tue Apr 25 16:14:08 2017 +1000

    Merge pull request #9 from conda-forge-admin/feedstock_rerender_master
    
    MNT: Re-render the feedstock [ci skip]

commit 976bd2a2974d598883f5ee40ef868c14f2cdb0e3
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Tue Apr 25 01:37:26 2017 +0000

    MNT: Updated the feedstock for conda-smithy version 2.3.0.

commit 55fe335d3ba4f546191c66babbe0e3158b3e5bf8
Merge: 81fc3f0 648878f
Author: Juan Nunez-Iglesias <jni.soma@gmail.com>
Date:   Thu Mar 30 11:07:41 2017 -0400

    Merge pull request #8 from jni/0.13
    
    Update recipe for 0.13

commit 648878f8760558d0e2b6e74259549e767cbe3e30
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Thu Mar 30 09:55:43 2017 -0400

    Add msinttypes build dep for Py27 Win build

commit e806da9ff051958fbc364434a4bd906eb82ced7a
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Thu Mar 30 00:32:47 2017 -0400

    Add correct feedstock URL in README badges

commit ef503826723c3a64d00ea1cb3260cb782c5b72eb
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Mar 29 23:31:05 2017 -0400

    Reset build, use SHA256, add licence file

commit 069ef5ffe2950245c3fc29fed7ae60e5f1fa10b9
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Mar 29 23:10:17 2017 -0400

    Fix NumPy x.x bug and re-render

commit 6a25f1dee5927095dddf47a7231286b440358f61
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Mar 29 13:16:42 2017 -0400

    Rename pywavelets to lowercase

commit ffd5279f5285f6a686e69e62787314eec9a2348b
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Mar 29 12:14:21 2017 -0400

    Update dependencies

commit 4183458c11580b51617d856bfbf1cbad6cc5af0c
Author: Juan Nunez-Iglesias <juan.n@unimelb.edu.au>
Date:   Wed Mar 29 12:05:56 2017 -0400

    Update recipe for 0.13

commit 81fc3f0acb1e21a19a9cd276e7c72128a07272db
Merge: 5e0dc93 5aa286b
Author: jakirkham <jakirkham@gmail.com>
Date:   Sun Mar 19 15:44:43 2017 -0400

    Merge pull request #7 from jakirkham/re-render__master__2.1.1
    
    Re-render 2.1.1, Win + NumPy 1.12

commit 5aa286b328c831a435d4e3db083685209eb0f684
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Tue Mar 14 21:51:30 2017 -0400

    MNT: Re-rendered with conda-smithy 2.1.1

commit 5e0dc93cfc8e632a8f72b45fcbde2b97bbc70661
Merge: ec668a3 9f20680
Author: Juan Nunez-Iglesias <jni.soma@gmail.com>
Date:   Sun Feb 19 14:04:32 2017 +1100

    Merge pull request #6 from jakirkham/missing-dask_1
    
    Add missing dask (bump build number)

commit 9f2068054db26671b87dbef7ad3b6a717f4e2710
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Feb 17 18:29:48 2017 -0500

    Bump build number to 1.

commit ec668a36ee8263adc5dfc487015a7c8704d29fef
Merge: 0847784 d0227d0
Author: Juan Nunez-Iglesias <jni.soma@gmail.com>
Date:   Sat Feb 18 10:18:53 2017 +1100

    Merge pull request #5 from astrofrog/missing-dask
    
    Add missing dask dependency and make minimum version numbers explicit

commit d0227d017c98c4173a37e5c26a2cb8719cd9b6b1
Author: Thomas Robitaille <thomas.robitaille@gmail.com>
Date:   Fri Feb 17 10:21:03 2017 +0000

    Add missing dask dependency and make minimum version numbers explicit

commit 0847784f1d8e6594d3951f5611fdd029f8e8dd5d
Merge: 6268677 d5a27e8
Author: Filipe <ocefpaf@gmail.com>
Date:   Thu Feb 9 09:03:17 2017 -0300

    Merge pull request #4 from ocefpaf/np112
    
    build for np112

commit d5a27e80f8dae5755c9012b4929a31ce01994455
Author: ocefpaf <ocefpaf@gmail.com>
Date:   Wed Feb 8 17:40:13 2017 -0300

    build for np112

commit 6268677c964d8961fe902bb34ec5379ad7d910f1
Merge: 6829939 6bf3787
Author: Juan Nunez-Iglesias <jni.soma@gmail.com>
Date:   Mon Jan 9 10:52:17 2017 +1100

    Merge pull request #3 from astrofrog/conda-smithy-170
    
    MNT: Re-rendered with conda-smithy 1.7.0

commit 6bf37878eeb789b56db1f1f5b6a065ae887cbbb8
Author: Thomas Robitaille <thomas.robitaille@gmail.com>
Date:   Sun Jan 8 10:43:29 2017 +0000

    MNT: Re-rendered with conda-smithy 1.7.0

commit 6829939f4d190f4cb99e4d7cad1ed6ee77e12b3c
Merge: 3fab2f2 4c8035c
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat Jun 18 13:28:01 2016 -0400

    Merge pull request #1 from jakirkham/add_jni
    
    Add @jni

commit 4c8035c98a71798c2ce2b976054826c178e8074a
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Jun 17 19:13:48 2016 -0400

    recipe: Add @jni.

commit 3fab2f2d3f05b4a0455022e3a5db77076247d198
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat May 21 22:12:36 2016 +0000

    Re-render the feedstock after CI registration.

commit d189c1fe65bc0751656bd0c07dae0c63c9efca87
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat May 21 22:11:41 2016 +0000

    Initial commit of the scikit-image feedstock.
