commit 4df868755ac5d870e89e70ee4784e1366147da86
Merge: c058e81 591e77b
Author: Floris Bruynooghe <flub@devork.be>
Date:   Mon Jun 15 23:58:17 2020 +0200

    Merge pull request #11 from regro-cf-autotick-bot/1.4.1_hd00ed0
    
    pytest-timeout v1.4.1

commit 591e77b7ca2e129aee05004e7325300d2b8e4de7
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Mon Jun 15 21:12:27 2020 +0000

    updated v1.4.1

commit c058e81aab7b830ad9069a676496cca074501a6f
Merge: ef86056 c08d9f2
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Sun Jun 14 17:14:29 2020 -0300

    Merge pull request #10 from regro-cf-autotick-bot/1.4.0_heb8f60

commit c08d9f277dd80bececf85a2368d9e01e6964e28a
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Jun 14 20:08:01 2020 +0000

    MNT: Re-rendered with conda-build 3.19.2, conda-smithy 3.7.3, and conda-forge-pinning 2020.06.13.02.15.08

commit 00da3ca51000f4e2c7303a67fdde66377e04c9e6
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sun Jun 14 20:07:30 2020 +0000

    updated v1.4.0

commit ef86056209af38f692b4bb067f333214839e7124
Author: conda-forge-admin <conda-forge-admin@email.com>
Date:   Sun May 17 17:23:11 2020 +0000

    [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomerge

commit 83b82d55a5ca37089e1b7ad0617de431e9b9edac
Author: conda-forge-admin <conda-forge-admin@email.com>
Date:   Sun May 17 17:23:08 2020 +0000

    [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CFEP13TokensAndConfig

commit 660a1b66ea927d01dca7593928950995cf772725
Author: conda-forge-admin <conda-forge-admin@email.com>
Date:   Tue Mar 3 00:12:29 2020 +0000

    [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration AutomergeAndRerender

commit a783d8c605019801ab3d9035b4445c5fd20eb821
Merge: 6acb7df ec052db
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Mon Jan 6 18:29:14 2020 -0300

    pytest-timeout v1.3.4 (#9)
    
    pytest-timeout v1.3.4

commit ec052db93aca95e34ed852fb0397e53276c5cac8
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Mon Jan 6 20:15:42 2020 +0000

    MNT: Re-rendered with conda-build 3.18.11, conda-smithy 3.6.5, and conda-forge-pinning 2020.01.05

commit 1ffb7fa7f318e87fb6429a94060d1a22b414450e
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Mon Jan 6 20:15:26 2020 +0000

    updated v1.3.4

commit 6acb7df455065557e51df6f0f03db03b82e7e5a5
Merge: 724c340 c91d9c0
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Fri Nov 16 11:10:27 2018 -0200

    Merge pull request #8 from regro-cf-autotick-bot/1.3.3
    
    pytest-timeout v1.3.3

commit c91d9c0e4aae2dc9d2b530ddbcbce8df6aa5d965
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Fri Nov 16 12:13:26 2018 +0000

    updated v1.3.3

commit 724c340c81c963553c1607b3d495f019694030a6
Merge: 07b2aa6 0d42af1
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Mon Aug 27 19:33:19 2018 -0300

    Merge pull request #7 from regro-cf-autotick-bot/1.3.2
    
    pytest-timeout v1.3.2

commit 0d42af16a728be45695b58f9deef1105ea004ba0
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Mon Aug 27 22:21:26 2018 +0000

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

commit 82162d2761285635ceddff69f95aa1374d2e1bff
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Mon Aug 27 22:21:21 2018 +0000

    updated v1.3.2

commit 07b2aa6055239abe0350056b0b53531c95c48eb4
Author: Travis CI User <travis@example.org>
Date:   Sat Aug 4 17:36:13 2018 +0000

    [ci skip] [skip ci] Update anaconda token

commit 17f8603970e46ed4fcfbe240215bef7d84c78ab7
Merge: 1c5ff80 7a4187e
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Mon Jul 23 19:29:39 2018 -0300

    Merge pull request #6 from regro-cf-autotick-bot/1.3.1
    
    pytest-timeout v1.3.1

commit 7a4187e1e805c23e7e829d978514bf6cdb79e828
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Mon Jul 23 21:13:23 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.6 and pinning 2018.07.20

commit e218f47698ac3da76b91c8f0199453ed50d18ee7
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Mon Jul 23 21:13:17 2018 +0000

    updated v1.3.1

commit 1c5ff8018428d4e9d259fe8eec4deb3d631cb8a8
Merge: 8c04ef5 44494a2
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Tue Jun 19 15:18:02 2018 -0300

    Merge pull request #5 from jjhelmus/ar_sync
    
    sync with AnacondaRecipes

commit 44494a234101f437fe0b15e2d38f8f2ba4358338
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Mon Oct 16 23:56:53 2017 -0500

    Make recipe cross-compile capable

commit 75a35890dcf51f756ee4124e4e5a7d59b5116895
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date:   Mon Oct 16 23:56:48 2017 -0500

    Update about section

commit 8c04ef5547d63d83ec765f061cf3aa89360d17d5
Merge: 975aba6 bd986a5
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Wed Jun 13 21:05:30 2018 -0300

    Merge pull request #4 from regro-cf-autotick-bot/1.3.0
    
    pytest-timeout v1.3.0

commit bd986a547dbc83e9c734b78f0c42a57fb76ac342
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Wed Jun 13 20:38:06 2018 -0300

    Use pip to install package and update pytest dependency

commit 7578438be1106d73067abb39f4eecd80891760bd
Author: Travis CI User <travis@example.org>
Date:   Wed Jun 13 23:29:51 2018 +0000

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

commit 21fbdbae025cb9ac19a1a7bb29afcd9a3edf69bb
Author: Travis CI User <travis@example.org>
Date:   Wed Jun 13 23:29:46 2018 +0000

    updated v1.3.0

commit 975aba69ba6eeefb1140e13d7abf09886a94cd97
Merge: 0735ec0 91dc41c
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Tue Nov 28 20:00:20 2017 -0200

    Merge pull request #3 from nicoddemus/release-1.2.1
    
    Update to 1.2.1

commit 91dc41c14ce73b56e92846563b3fe10ec73cb026
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Tue Nov 28 21:54:04 2017 +0000

    MNT: Re-rendered with conda-smithy 2.4.3

commit 79f281ce1b1dffaa7598c9500047606951d538b0
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Tue Nov 28 21:53:24 2017 +0000

    Add noarch:python option

commit 09ccd28a64bd09e1cc0e5c7058b6b85824f43624
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Tue Nov 28 19:52:14 2017 -0200

    Update to 1.2.1

commit 0735ec0a2756215970f4e2097a83cdc83ea71dce
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat Aug 26 21:44:23 2017 +0000

    [ci skip] [skip ci] Update anaconda token

commit 252211b25b6226d1d9b42c0ed77c24506a9b6f54
Merge: a4941cc 73e45c7
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Tue Dec 27 00:22:18 2016 -0200

    Merge pull request #2 from nicoddemus/rerender-1.7.0
    
    MNT: Re-rendered with conda-smithy 1.7.0

commit 73e45c7f48833b1d2292b9d2ecb25bea0a5779bb
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Mon Dec 26 22:04:01 2016 +0000

    MNT: Re-rendered with conda-smithy 1.7.0

commit a4941cc00d4a975943d2aa2a64dd6b8e22b7efa7
Merge: 7cbd638 49a0112
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Thu Dec 1 08:22:26 2016 -0200

    Merge pull request #1 from flub/v1.2.0
    
    Upgrade to 1.2.0 release

commit 49a01129e6031c0c780e7be904794efe249bbfdb
Author: Bruno Oliveira <nicoddemus@gmail.com>
Date:   Tue Nov 29 19:59:39 2016 +0000

    MNT: Re-rendered with conda-smithy 1.6.1

commit 4b3a2b4a6e9a44bf2c7503c19059ffae0f441885
Author: Floris Bruynooghe <flub@devork.be>
Date:   Tue Nov 29 11:40:05 2016 +0000

    Upgrade to 1.2.0 release

commit 7cbd6388b4f6afd19da5706c332ee222120331fe
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Wed Oct 19 06:44:51 2016 +0000

    Re-render the feedstock after CI registration.

commit 0297de975f1fd224ea49d64b4293dc17d10ea293
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Wed Oct 19 06:43:29 2016 +0000

    Initial commit of the pytest-timeout feedstock.
