Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hackebrot convert test cookiecutter local with input #334

Conversation

hackebrot
Copy link
Member

Convert test_main.TestCookiecutterLocalWithInput using monkeypatch of py.test.

According to the name of the original name and the doc string of test_cookiecutter_input_extra_context the no_input argument needs to be False, so I changed the former version.

Please let me know if this is correct.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling df4aada on hackebrot:hackebrot-convert-test-cookiecutter-local-with-input into 376316c on audreyr:master.

@michaeljoseph
Copy link
Contributor

👍

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 1646f7e on hackebrot:hackebrot-convert-test-cookiecutter-local-with-input into 376316c on audreyr:master.

@michaeljoseph michaeljoseph added developers This issue/PR has request to other project developers enhancement This issue/PR relates to a feature request. labels Nov 24, 2014
@pydanny
Copy link
Member

pydanny commented Mar 14, 2015

@hackebrot I want to merge this in for the 1.0 release this weekend (#410) but the file has evolved a bit. Would you be up to rebasing and resubmitting?

(If not I completely understand)

@hackebrot hackebrot mentioned this pull request Mar 14, 2015
@hackebrot
Copy link
Member Author

@pydanny @michaeljoseph 🔔

hackebrot added a commit to hackebrot/cookiecutter that referenced this pull request Mar 15, 2015
pydanny added a commit that referenced this pull request Mar 15, 2015
…utter-local-with-input

Hackebrot convert test cookiecutter local with input
@pydanny pydanny merged commit eb3bb61 into cookiecutter:master Mar 15, 2015
@hackebrot hackebrot deleted the hackebrot-convert-test-cookiecutter-local-with-input branch March 20, 2015 18:12
jhermann added a commit to jhermann/cookiecutter that referenced this pull request Mar 24, 2015
commit 0051fdcc0233e8d0eb5daeeaca68419debdea521
Merge: 0cb9f30 9fe4e8b
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Wed Mar 18 11:24:24 2015 +0200

    Merge pull request #420 from streeter/patch-1

    pip is preferred for Python packaging over easy_install

commit 9fe4e8bc64581e6404cb414333eb81ea857f8857
Author: Chris Streeter <chris@chrisstreeter.com>
Date:   Tue Mar 17 18:16:37 2015 -0700

    pip is preferred for Python packaging over easy_install

    https://python-packaging-user-guide.readthedocs.org/en/latest/current.html

commit 0cb9f30fa9b75b6a9eb6afa28782af7bd582b9e7
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Mon Mar 16 08:53:06 2015 -0400

    Update HISTORY.rst

commit 3eddbbd06f9867cd0451133c46347ed2e9e344e3
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Mon Mar 16 08:49:03 2015 -0400

    Update history and bump to 1.0

commit 658bcaee04377a8488045fdc965bddd1f22c1c73
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sun Mar 15 20:17:50 2015 -0400

    Document Michael's work on whee

commit 45d24da781e9410005f70384eefab80cd82addc5
Merge: 77c248e 43642c2
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 20:17:10 2015 -0400

    Merge pull request #118 from michaeljoseph/whee

    Whee!

commit 77c248ee58b8a3d21e9ffdef826bfdaf5468d448
Merge: fb94d98 6c8c2e0
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 20:15:17 2015 -0400

    Merge pull request #418 from hackebrot/remove-obsolete-test-config

    Clean up test_config.py

commit fb94d9832168319194cac7c4ac15d4a4b513adf6
Merge: 208abcc 07e88ce
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 20:14:58 2015 -0400

    Merge pull request #417 from hackebrot/remove-unittest-baseclass-in-tests-init

    Remove unittest baseclass in tests init

commit 208abcc475c405d2859c440d59eb0561daf5ad5d
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sun Mar 15 20:14:14 2015 -0400

    Added @marctc as author thanks to his work on #265

commit ca047ead2e83e90618d0e047568c9fed1372b040
Merge: 170b8e6 9d5735b
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sun Mar 15 20:10:49 2015 -0400

    Merge branch 'APSL-explicit-repo-names'

commit 9d5735bfbe22e8e225f3214ecf700de76f202125
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sun Mar 15 20:10:12 2015 -0400

    Rebase and merge

commit 170b8e6da1219e8af0d604f1268235baf078d35d
Merge: 69e46f8 2fa8357
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 19:35:33 2015 -0400

    Merge pull request #335 from michaeljoseph/fix-pytest-collection

    Leave it to py.test discovery

commit 69e46f8700dbbbc0a2a985338f50f00aac32cb37
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sun Mar 15 19:35:09 2015 -0400

    Update the history

commit 6c8c2e04d9e6cad2143e04c1f8b33d9a1d001b43
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:39:06 2014 +0100

    Remove original unittest module, cherrypick of b7b96f9

commit 07e88cee9b9ecd3f9e5a9980c16cc6ab455c3dd8
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 20:35:51 2015 +0100

    Create blank init in tests to be able to import skipif markers

commit a92f2f4210fd9043071cced859c56c342b11bc0e
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 20:35:19 2015 +0100

    Remove CookiecutterCleanSystemTestCase in favor of conftest fixture

commit 1ce4dde618d436e12182a9ae52532b6430be3393
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 14:57:38 2015 -0400

    deleted as it tests removed functions.

commit 219a1068a363048a10c3d9040ff7b030b33e7ce3
Merge: c4d5ee0 7b9eb7b
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 14:50:12 2015 -0400

    Merge pull request #414 from hackebrot/convert-test-vcs-to-pytest

    Convert test vcs to pytest

commit c4d5ee0fdbff4893b0ca24e54851f8bebe65622c
Merge: ccbd647 81bcbbc
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 14:47:31 2015 -0400

    Merge pull request #413 from hackebrot/convert-test-utils-to-pytest

    Convert test utils to pytest

commit ccbd64731491f09586ecfb08de6c8b925ba11982
Merge: 6788024 1764ab3
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 14:46:17 2015 -0400

    Merge pull request #412 from hackebrot/convert-test-hooks-to-pytest

    Convert test hooks to pytest

commit 67880241befa7a35b6be825e0af944a6d7663dfe
Merge: eb3bb61 bdb5414
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 14:44:46 2015 -0400

    Merge pull request #337 from hackebrot/hackebrot-convert-test-abbreviation-expansion

    Convert test abbreviation expansion to py.test

commit eb3bb6161ed56e3f8ce7a501c23e435d978ca2be
Merge: 773f22a 1427648
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Mar 15 14:43:54 2015 -0400

    Merge pull request #334 from hackebrot/hackebrot-convert-test-cookiecutter-local-with-input

    Hackebrot convert test cookiecutter local with input

commit 773f22a0af546fd7044c5b89f295070c6577857d
Merge: e5ca83d fb65fc7
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Mar 15 18:28:28 2015 +0200

    Merge pull request #415 from kmike/patch-1

    DOC update usage.rst: 0.7 release is no longer upcoming

commit e5ca83d886503e55b4eab0ba252bdd23f5980ba0
Merge: a550efa c385408
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Mar 15 18:20:59 2015 +0200

    Merge pull request #411 from hackebrot/fix-contributor-ref-in-changelog

    Fix contributor ref in changelog

commit fb65fc7b740caf634a6a236368ec6f9be3426f0e
Author: Mikhail Korobov <kmike84@gmail.com>
Date:   Sun Mar 15 21:07:43 2015 +0500

    DOC update usage.rst: 0.7 release is no longer upcoming

commit 7b9eb7bd7559a7f7019f689a9c5ee9c7967c945a
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:28:25 2015 +0100

    Use uppercase constant name and single quotes

commit 58b75c5e872bed2ad13ed047195dc21395c990c4
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:26:56 2015 +0100

    Get rid of unittest and original skip check

commit f30b658275a62294593d31175e1e13118140abb7
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:25:55 2015 +0100

    Fix flake8 in test_vcs.py

commit c61330da5a22f98ad7cf36e44e58096f810fdddd
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:24:42 2015 +0100

    Convert test_vcs_not_installed and remove class TestVCS

commit 0e62005c2b18602e8c0028d9a7eb79d61fecbc51
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:22:07 2015 +0100

    Convert test_hg_clone

commit be02f661de1c5a5326557c6a35b4aa93618e1431
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:20:40 2015 +0100

    Convert test_git_clone_custom_dir

commit b290859244d73c44363b3e975c98cdf88fb72548
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:17:09 2015 +0100

    Convert test_git_clone_checkout

commit 472960a13b758f2d66c26c44b84be4dbce3e8957
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:15:13 2015 +0100

    Convert test_git_clone in the same module

commit 87df9f8a5fdafaf745d96daf5c2114d5e284196a
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 14:12:23 2015 +0100

    Remove logging from test_vcs.py as it is not used

commit a63fab9f16ab2313da7f6b5f5e73cd1cb228f3cf
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:51:17 2015 +0100

    Convert test_hg_clone_cancel and remove TestVCSPrompt class

commit e99a65600e96193fceb5b62d6aa6cec387712d56
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:47:44 2015 +0100

    Convert test_hg_clone_overwrite

commit 9eb9a639dff0337121ba099f8b109609bd586311
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:45:19 2015 +0100

    Convert test_git_clone_cancel

commit 5e8b1bf2b108b48cf8ff1bae7d4fcc105efb9720
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:41:41 2015 +0100

    Convert test_git_clone_overwrite_with_no_prompt

commit eeca6778165d0b19291d75627d82fea5a4bab414
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:40:06 2015 +0100

    Reimplement test_git_clone_overwrite using skipif markers

commit 194bf3f4ba0b3488a5cfbb536247ac9f1bc7a006
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:28:57 2015 +0100

    Reimplement setup and teardown of TestVCSPrompt

commit 53cb3adb97bb434a896938c2c7f78109e5b5566f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:27:39 2015 +0100

    Use single quotes instead of double quotes

commit 5252d74dc235386ed089a1fbe0dfdd8a611ec7d1
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:19:37 2015 +0100

    Convert TestIsVCSInstalled to pytest

commit 1f3ac498433b7c20d1ee2dccf056f66c1c323dc9
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:17:21 2015 +0100

    Fix module doc str in test_identify_repo

commit 9db6fe463c7297ad8e236f2e4e84b6dbe4f32ff0
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:15:44 2015 +0100

    Create separate module for test_identify_repo

commit 7af06d00d96cdf1b55e4437de3638cae899bce63
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:10:15 2015 +0100

    Fix flake8 for pytest tests

commit 68d73e4e7cd3bf9dbcf8cc705aa3f4c7c358fef6
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 13:05:57 2015 +0100

    Convert TestIdentifyRepo to pytest

commit 81bcbbca7a824e0ba41135ac6c6e59916587bf3d
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 12:22:47 2015 +0100

    Get rid of unittest import and fix PEP8

commit 0b9d4dc6ae5fa237a78993cab65ed9191c8f4325
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 12:21:30 2015 +0100

    Convert test_workin to pytest test function

commit 055b2a7c7f9dfde07a53211a890ee0d88c9a57cf
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 12:18:31 2015 +0100

    Convert test_make_sure_path_exists

commit 860509c982b305d13ee6e7a54d77b352d3f93484
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 12:16:47 2015 +0100

    Convert test_rmtree to pytest test function

commit 4a58437799221dbc5fcfd0b9ec3d38e92a70996e
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 12:14:04 2015 +0100

    Add comment to helper function make_readonly

commit 1764ab3ba5de55d26c55f73e31bbbc114bbf9866
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 11:44:00 2015 +0100

    Add comment to helper function make_test_repo

commit f045e07f82038f60a7dee0f9b53f391bbaa5e71a
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 11:40:03 2015 +0100

    Fix pep8 in test_run_hook

commit f0af92737a3385917d3cd45e539ba5521626dce1
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 11:39:11 2015 +0100

    Remove unittest from test_hooks.py

commit 80b70480d3363e65a2cc7edac43e7f7a4bfbf760
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 11:37:52 2015 +0100

    Convert TestExternalHooks assert statements

commit a6627e398a69dd2d5809ab0e9de30632e53420c5
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 11:32:18 2015 +0100

    Update setup and teardown of TestExternalHooks

commit 73a5d78cdd556c4d7039c3c0f4b2740c59dcbb75
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 11:26:56 2015 +0100

    Convert test_no_hooks

commit f39bd5145ad5f073ce3c66b83a71f62eadc6b1d0
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 11:25:39 2015 +0100

    Change test_find_hook to pytest syntax and fix PEP8

commit 98d34d85a70dea840847e7c49d14bc13abf6f85e
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 11:20:30 2015 +0100

    Change TestFindHooks to use pytest setup and teardown

commit c38540889647352cd3cfdbbe9d5d483adbe9f2b6
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 10:49:15 2015 +0100

    Sort contributor references alphabetically

commit 30fec0452524688a01f6ce1730c7bb251085f41a
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 10:47:22 2015 +0100

    Add link to @pydanny in HISTORY.rst

commit bdb54143bf8141c53564ba10470ffdee616a5bef
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 02:17:06 2015 +0100

    Remove test_main.py as all of its tests have been converted, resolve #343

commit 397b48e9837cd66b04cc77c08fb569ca97e935c1
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 02:16:14 2015 +0100

    Remove original implementation of TestAbbreviationExpansion

commit 558af9665bd74f2e85726178fbbcef080ef3bfcd
Merge: f647845 1427648
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 02:10:25 2015 +0100

    Merge branch local-with-input of #334 and overwrite target changes to test_main.py

commit 142764879d8437ef28b45ef1c9f2b4261f588af7
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 01:34:36 2015 +0100

    Remove unused import of os

commit c70bdcdb5a6058a79a55a310360865da3e851837
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 01:33:53 2015 +0100

    Get rid of no network check in test_main.py

commit d8882cabc9c78b6af0a00912f329d19f937e3848
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 01:32:14 2015 +0100

    Remove unused imports in test_main.py

commit f3f917be4c8635bc6829dc12c6f9318876e6f594
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 01:30:40 2015 +0100

    Remove original implementation of TestCookiecutterLocalWithInput

commit d21fbb3e8304c2bb0831115909cdeb4229d435c9
Merge: 1646f7e a550efa
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Mar 15 01:17:26 2015 +0100

    Merge master and overwrite changes of the feature branch to test_main.py

commit a550efa3a56b2523765badbc1203aaffd06e0e8b
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Mar 14 17:02:09 2015 -0400

    merge

commit feabe0a9172577f958cb9ac899146c425f1d76d4
Merge: 391853f 7830a08
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Mar 14 16:52:37 2015 -0400

    Merge branch 'hackebrot-hackebrot-convert-test-config'

commit 391853f04ebff25994cd86a0cbe9f905cdce616b
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 25 21:42:34 2014 +0100

    Add finalizer to remove the rc created by the tests

commit 16d378958334e77adaed5aaa0b01ce9688bacd56
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:52:20 2014 +0100

    Optimize formatting a bit

commit ffa02c0cf323ac495e5393dec55d9e54acb4934a
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:34:51 2014 +0100

    Use back_up_rc and convert test_get_user_config_nonexistent

commit f3fe5ecfe82829d2f3f64056d6e20c6ec993d7a2
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:21:07 2014 +0100

    Convert test_get_user_config_invalid to py.test

commit ab326bea78a4e0199eb1527a8f3b50b04497ac8e
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:05:01 2014 +0100

    Use ticks instead of double quotes

commit 8767a8a343077d63c47a014e6b47d97356a97e6a
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 22:55:20 2014 +0100

    Convert test_get_user_config_valid with fixture

commit 98b66fd28d0651022a55fb3d32c69a533e395760
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 20:08:19 2014 +0100

    Remove self references from setup/teardown

commit d180b780487b81b06beb24e809cfb17fd2320e3f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 19:59:14 2014 +0100

    Create new module for TestGetUserConfig with setup/teardown

commit e2582583c92264e86db2f6322d54cb7adba65440
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 08:30:42 2014 +0100

    Use ticks instead of double quotes for str literals

commit a6d34b91d0d27d3617e14d13947571e8fa21484d
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 08:23:24 2014 +0100

    Convert TestGetConfigWithDefaults to pytest

commit 5fb551dec139d826369df98f5dac86ecfc13e5e3
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 08:15:20 2014 +0100

    Convert test_invalid_config

commit 399347e433c07daf041aac302437e98829a5a42f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 08:11:40 2014 +0100

    Convert test_get_config_does_not_exist

commit 97bc1ef2ed35f1a07a394b29f92b9eead7fef443
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Nov 23 20:02:26 2014 +0100

    Convert test_get_config to py.test

commit 7830a08f4fd6afdf40c25e5180eb7e1b7e4380d8
Merge: 3399265 a864c6b
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Mar 14 16:51:12 2015 -0400

    merge

commit 43df3e8b8c74ef0f0cf1d3616a94b3c4a95dfaac
Merge: 8649559 0208a38
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sat Mar 14 16:47:53 2015 -0400

    Merge pull request #341 from hackebrot/hackebrot-convert-test-find

    Hackebrot convert test find

commit 86495594d777be37c499151a755cc02fbbdcb0b8
Merge: 3399265 2fa57fc
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sat Mar 14 16:47:10 2015 -0400

    Merge pull request #338 from hackebrot/hackebrot-convert-test-cookiecutter-repo-arg

    Convert test cookiecutter repo arg to pytest

commit 3399265e927c6c47fb641c7f08b64f00b1d7e227
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Mar 14 16:46:36 2015 -0400

    Update history

commit 2ca381c735bb2a93a75ed8b6e64fb3c165157d33
Merge: 80b3ac6 8552fbf
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Mar 14 16:44:57 2015 -0400

    Merge branch 'hackebrot-hackebrot-convert-test-compat'

commit 8552fbfbd88aec309a4addbc756e7a39e9a65065
Merge: 80b3ac6 dc6d9ec
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Mar 14 16:44:34 2015 -0400

    Fixed merge

commit 80b3ac6811b0662d0a70cc7cfb6b2066c4df1bca
Merge: aa23fa6 5361894
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sat Mar 14 16:36:37 2015 -0400

    Merge pull request #336 from hackebrot/hackebrot-test-arg-parsing

    Hackebrot test arg parsing

commit 43642c2900c74197782f6927c2ca0f1dc9f327d3
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Mar 14 17:33:13 2015 +0200

    wheel => bdist_wheel

commit 7e1adb2e26365650de7d6fd3df503caf091768ce
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Nov 23 13:04:40 2013 +0200

    Actually generate the wheel on release

commit 29e3342d5a96b6d5a9349b660e22a66668313ad1
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Fri Nov 15 14:40:55 2013 +0200

    Make whee

commit 5807632cc806f4d6de31f1807f39db079af8f5ec
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Fri Nov 15 14:40:42 2013 +0200

    Configure a universal wheel

commit aa23fa6ae708e699962358f0779d40da4cd0b28a
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Mar 14 17:22:55 2015 +0200

    Add cookiedozer

commit 51992ed67f8ffc453aabc5041033b8884a63bfd6
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Mar 14 17:22:10 2015 +0200

    Fix @jpadilla and cookiecutter-django-rest-framework references

commit 7358a43e965f3b3208a82018c6986d0a3319eb39
Merge: b12b22d 8304263
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Mar 14 17:07:21 2015 +0200

    Merge pull request #392 from hackebrot/hackebrot-add-cookiedozer-template

    Add cookiedozer to the list of python templates

commit 2fa83576fe699b3edfa0ea30662291b32dc0192e
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Mar 14 16:34:52 2015 +0200

    Add default tests posargs

commit b12b22d8a6fee929a31d9defca2ab08e55107540
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Thu Mar 12 15:24:54 2015 -0700

    Adding @jpadilla's package

commit 78125a803584137cf1cccc7e7906e3f3b3bda412
Merge: 3b4d067 b77873d
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Mar 12 15:21:23 2015 -0700

    Merge pull request #346 from jpadilla/patch-1

    Add cookiecutter-django-rest-framework

commit 3b4d0672464437097d8faf3ea464b39d88ae1288
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Thu Mar 12 15:17:38 2015 -0700

    Added the tutorial enhancements to the changelog

commit a97def57c5a383aa0bdf1dc006700616e93089d3
Merge: 2d5ed1a 8f17698
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Mar 12 15:16:25 2015 -0700

    Merge pull request #384 from hackebrot/add-tutorials-page-to-docs

    Add tutorials page to docs

commit 2d5ed1a9b2900afce88d37f578828018b9768ffe
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Thu Mar 12 15:14:52 2015 -0700

    Added cookiecutter-latex-article by @Kreger51 to changelog

commit ffbe8930af5f11613f5e2653237b4fe46e449817
Merge: 81267a6 e3d8e18
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Mar 12 15:11:29 2015 -0700

    Merge pull request #396 from Kreger51/master

    Add cookiecutter-latex-article to list of LaTeX templates.

commit 81267a60baf70261206868259cbaadd826ea342d
Merge: a44b4f4 6fa19d8
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Wed Mar 11 20:01:37 2015 -0700

    Merge pull request #347 from hackebrot/hackebrot-integrate-pytest-in-setup

    Hackebrot integrate pytest in setup

commit 6fa19d80f8b0a7c00fcc45a0199b63992c98a336
Merge: af3ccba ec4deb5
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Thu Mar 12 00:42:44 2015 +0100

    Merge latest master and resolve conflict in setup.py

commit a44b4f410980a4528a64a1b1ad8aa4e09cf75f6b
Merge: ec4deb5 92349b0
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Wed Mar 11 16:24:42 2015 -0700

    Merge pull request #407 from msabramo/fix_flake8_version_conflict

    tox.ini: Fix flake8 version conflict

commit 92349b0610c914d5135b7b4a9b87cefeb9cba8af
Author: Marc Abramowitz <marc@marc-abramowitz.com>
Date:   Wed Mar 11 14:04:57 2015 -0700

    tox.ini: Fix flake8 version conflict

    Fixes the following version conflict error:

        $ rm -rf .tox/flake8
        $ tox -e flake8
        ...
          File "/Users/marca/dev/git-repos/cookiecutter/.tox/flake8/lib/python2.7/site-packages/pkg_resources.py", line 643, in resolve
            raise VersionConflict(dist, req) # XXX put more info here
        pkg_resources.VersionConflict: (pep8 1.6.2 (/Users/marca/dev/git-repos/cookiecutter/.tox/flake8/lib/python2.7/site-packages), Requirement.parse('pep8>=1.5.7,<1.6'))
        ...

commit ec4deb5bc512a6e5152e171c510472338376f59f
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Mar 5 16:45:40 2015 -0800

    Update HISTORY.rst

commit 4fffcf17f1b6c9105a8ffcebafaccb45d9b168c4
Merge: 1c389aa 07fea9c
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Mar 5 16:42:48 2015 -0800

    Merge pull request #403 from msabramo/fix_windows_test_failures

    Fix Windows test failures

commit 1c389aad5549617a0aeb445e53cb312429d47969
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Mar 5 15:10:59 2015 -0800

    Added @msabramo to the authors list.

commit 6c5edacd1f72bfce065b463b07239d60b1c83854
Merge: b24cf6d 0d3039f
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Mar 5 15:09:49 2015 -0800

    Merge pull request #402 from msabramo/fix_appveyor_badge_link

    README.rst: Fix AppVeyor badge link

commit 07fea9c7c83a1d6d1447a29fced1df7e3bd536c3
Author: Marc Abramowitz <marc@marc-abramowitz.com>
Date:   Thu Mar 5 14:53:08 2015 -0800

    Fix Windows test failures

    and make AppVeyor tests pass again.

commit 0d3039ff4364c586c75608c57fc51ec42910d14a
Author: Marc Abramowitz <marc@marc-abramowitz.com>
Date:   Thu Mar 5 14:46:38 2015 -0800

    README.rst: Fix AppVeyor badge link

    Clicking it was taking me to the badge image instead of the actual
    builds.

commit b24cf6df5305de8144a22ada98178fdecebfe07a
Merge: b2efaf0 6b9c7c3
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Wed Mar 4 16:38:12 2015 -0800

    Merge pull request #332 from hackebrot/hackebrot-convert-test-cookiecutter-local-no-input

    Hackebrot convert test cookiecutter local no input

commit b2efaf0527d00658d9c63ae1cfcb89565b27283a
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Mar 3 18:00:48 2015 -0800

    Added @rsyring and @mark0978 to contributors

commit 288dd0e2c3fdcfafa6a02db860ba4cb6c30f1014
Merge: 242ebe8 7fbb514
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Mar 3 17:55:03 2015 -0800

    Merge branch 'mark0978-master'

commit 7fbb514f590257a274323b732df3e35f15282e74
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Mar 3 17:54:49 2015 -0800

    Bump versions to current version

commit fb590ca9848c937804ae75bcb1c3e574683a75da
Merge: 242ebe8 2303652
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Mar 3 17:44:25 2015 -0800

    Merge branch 'master' of https://github.com/mark0978/cookiecutter into mark0978-master

commit 242ebe84a889a0d27d935c6745ff6e6b0fbcfd04
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Tue Mar 3 09:23:24 2015 -0800

    Update AUTHORS.rst

commit 509be26a9ba1921baeb2b652e2b492fb3949a5f4
Merge: a29a5fe 3d2fb00
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Tue Mar 3 09:20:42 2015 -0800

    Merge pull request #395 from lord63/fix-broken-url

    Fix the broken roadmap link in HISTORY.rst

commit e3d8e184f4db9eb2368518288998435ec85fb77c
Author: Selim Belhaouane <selim.belhaouane@gmail.com>
Date:   Sun Mar 1 22:42:43 2015 -0500

    Add cookiecutter-latex-article to list.

commit 3d2fb0005ba46471dfc225653218959e3cf5fe50
Author: lord63 <lord63.j@gmail.com>
Date:   Fri Feb 27 11:20:17 2015 +0800

    Fix the broken roadmap link in HISTORY.rst

commit a29a5fe98f729c38a6084c05a0a0ec67c3478efe
Merge: d472253 0aded70
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Wed Feb 25 04:00:36 2015 -0800

    Merge pull request #394 from michaeljoseph/pep8-W503

    Fix flake8/pep8 linting

commit 0aded7081c9329962a5bf94f314947e6bee85689
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Tue Feb 24 14:59:30 2015 +0200

    Pin pep8 to address https://gitlab.com/pycqa/flake8/issues/32

commit 065edb9b82f2180600e67827b0184321f830a3fc
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Tue Feb 24 14:56:29 2015 +0200

    Fix W503 line break before binary operator

commit d4722539fb3426d68b91ed0f28ff7df5cb09be4c
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Feb 22 11:44:55 2015 -0800

    Update HISTORY.rst

commit 44ae7c5c79e61a2d4b14db75fab1fd16b46e5187
Merge: cb33f12 0643cc1
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Feb 22 11:42:12 2015 -0800

    Merge pull request #393 from michaeljoseph/click-option-documentation

    Adjust `ccext.py` for click options

commit 0643cc1b1b94c14c4745febc07ba775182bc7a4f
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Feb 22 16:32:35 2015 +0200

    Adjust `ccext.py` for click options

commit 8304263ef06fc91107d213f49737e7e65ff5a724
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Feb 21 20:55:08 2015 +0100

    Add cookiedozer to the list of python templates

commit cb33f12794746083def997b5b03402b513e8dc80
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Fri Feb 20 20:30:59 2015 -0800

    Fix #375 - docs now building.

commit 2303652b05a7a09b8387527bacc2822ea8d962b8
Author: Mark Jones <mjones@imagehawk.com>
Date:   Fri Feb 20 20:28:14 2015 -0600

    Minor fixes pointed out by tox and company

commit cbcf5e84ddff3264faf4896874bc1728b5154420
Merge: 16de7e8 47a74c4
Author: Mark Jones <mjones@imagehawk.com>
Date:   Fri Feb 20 20:27:06 2015 -0600

    Merge branch 'master' of github.com:mark0978/cookiecutter

commit 16de7e8b9d21aa9e5eefe7f87cb9178bdce7a2d8
Author: Mark Jones <mjones@imagehawk.com>
Date:   Sat Feb 7 11:11:42 2015 -0600

    Damn print statement

commit 687e09c663b9d8cedf02abdb5daacafc22782155
Author: Mark Jones <mjones@imagehawk.com>
Date:   Sat Feb 7 09:53:03 2015 -0600

    Fixed PR358

commit 0142778ffb44e9e55f607ddfd764ac57eeabeec6
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Tue Feb 10 09:35:09 2015 -0800

    Add @michaeljoseph's flake8 tweak to the history

commit c98406174763087483435cfd5cb9ad4fe8ac423f
Merge: 56fc9cb 13bf42c
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Tue Feb 10 09:33:11 2015 -0800

    Merge pull request #390 from michaeljoseph/flake8-ignore-e731

    Ignore E731

commit 13bf42ccdb9b63854e683e4cb054d10108ec1868
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Tue Feb 10 11:27:07 2015 +0200

    Move ignore to setup.cfg

commit 00eaec0abcabba975be2a13e8d03df47fd8c5a6a
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Tue Feb 10 11:13:13 2015 +0200

    Ignore E731

commit 47a74c4f8b19ce4af306520a235975439c0fe551
Author: Mark Jones <mjones@imagehawk.com>
Date:   Sat Feb 7 11:11:42 2015 -0600

    Damn print statement

commit 5715909854ca8372b926182bfed022bd7ce2f28f
Author: Mark Jones <mjones@imagehawk.com>
Date:   Sat Feb 7 09:53:03 2015 -0600

    Fixed PR358

commit 56fc9cbacd28c4318df9c28fed0d7c564d396df4
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Feb 5 14:02:11 2015 -0800

    Update HISTORY.rst

commit 16be20dbca5179d5ac5f6509867452f22ef079bf
Merge: e1cbbfc 04100f9
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Feb 5 14:00:23 2015 -0800

    Merge pull request #372 from avelino/patch-1

    added cookiecutter-bottle

commit 8f176981c5afc0a78c4b4289752f565711538ec0
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Feb 4 00:21:29 2015 +0100

    Remove unintended blank line

commit 77eddde4eb20268affa02171cfd119eb8e045dc4
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Feb 4 00:15:00 2015 +0100

    Get rid of numbering in tutorial captions

commit 449cbed1866260a3e870524e148a9db9f0240c59
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Feb 4 00:10:25 2015 +0100

    Remove individual tutorials in favor of overview

commit 7455c17a3118f2a4892ecb2db96f9c1bafa9403e
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Feb 4 00:06:08 2015 +0100

    Add Cookiedozer tutorials by @hackebrot

commit 5a673ddcd8affdea8f4593504128ffc62939d0d1
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Feb 3 23:36:29 2015 +0100

    Add a link to @pydanny's blog

commit 5d1d884e6fb640ec34542f71776d8fa51c953fd5
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Feb 3 23:25:18 2015 +0100

    Add tutorials by @audreyr to overview

commit d7ad7c8db013dbff1b8bd078c8c7919007a6f447
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Feb 3 23:02:33 2015 +0100

    Create tutorials docs page with empty sections

commit e1cbbfc440cf7bb2dac2d94beb49d2cd94ac22b2
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Mon Feb 2 10:01:16 2015 -0800

    Update HISTORY.rst

commit 1f3d9166b135d4259372746ceedce4a50cc68d2e
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Mon Feb 2 10:00:30 2015 -0800

    Added atari2600 by @joeyjoejoejr

commit 544eee00fc55e470ba6aea75588b2819af279cbb
Merge: 5ac872c 56cc6be
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Mon Feb 2 09:59:03 2015 -0800

    Merge pull request #382 from joeyjoejoejr/patch-1

    Adds cookiecutter-atari2600

commit 56cc6be4ce96a2edf68b4f40cce8a0bc85ff534c
Author: Joe Jackson <cpmhjoe@gmail.com>
Date:   Sat Jan 31 16:09:35 2015 -0500

    Adds cookiecutter-atari2600

commit 5ac872c3007cabda519b40394a9ed960e5fbf63e
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Jan 27 10:16:37 2015 -0800

    Giving @sfermigier credit for his work

commit 1e07711ad37afcb84650bf37616b88a077b8d5d7
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Jan 27 10:13:30 2015 -0800

    merge

commit 04100f9e7d6732aec033f51451b9ff55179cec65
Author: Thiago Avelino <thiago@avelino.xxx>
Date:   Wed Jan 21 15:28:33 2015 -0200

    added cookiecutter-bottle

commit 8c3d54f9bacd0077b0af9e65966699789307159b
Merge: 88a8e19 05cd9b3
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Tue Jan 20 21:34:14 2015 +0200

    Merge pull request #370 from jacebrowning/handle-non-str-in-json

    Handle non-strings in JSON

commit 88a8e19760b7d0aede0bc83ae28ccdeb8fc3dcd3
Merge: da5dcc8 75a8169
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Tue Jan 20 07:49:24 2015 -0800

    Merge pull request #309 from michaeljoseph/click

    Click

commit 05cd9b353793d382bdd1c689f8d705c723352624
Author: Jace Browning <jacebrowning@gmail.com>
Date:   Tue Jan 20 09:40:31 2015 -0500

    Remove an unnecessary comment and rename function

commit 3d77eaa10fa014cf181a61feaf41609446c29a32
Author: Jace Browning <jacebrowning@gmail.com>
Date:   Mon Jan 19 17:25:45 2015 -0500

    Simplify string detection

commit e43bd33eb8dfead1b7bfa1e1bebdceb4cc0cd34e
Author: Jace Browning <jacebrowning@gmail.com>
Date:   Mon Jan 19 14:30:40 2015 -0500

    Only cast non-string objects to strings

    Based on: http://stackoverflow.com/a/11301781/429533

commit 47db12eac3e5be4de2511e6096118f519289263d
Author: Jace Browning <jacebrowning@gmail.com>
Date:   Mon Jan 19 12:24:10 2015 -0500

    Cast all raw JSON to strings

    Fixes https://github.com/audreyr/cookiecutter/issues/368

commit da5dcc8ed564e09af40c4167f7c6f8fa31c2ea71
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Mon Jan 19 09:21:10 2015 -0800

    Documented move from coverals to codecov.

commit 9f6635946b2602f13558d39038445de240e16229
Merge: 3b508b8 cb14e9f
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Mon Jan 19 09:18:58 2015 -0800

    Merge pull request #369 from michaeljoseph/codecov-io

    coveralls => codecov

commit 951dd512e796410f46fcb196eb4f5406ff00953b
Author: Jace Browning <jacebrowning@gmail.com>
Date:   Mon Jan 19 12:17:41 2015 -0500

    Add a failing test for ints in JSON config

commit cb14e9fe64c04a2b0c78cddd0350389086b50aea
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Mon Jan 19 16:01:00 2015 +0200

    Swap coverage badge

commit 58e75ecbdec7f28e25946f1c48d8c5ba3076d0fe
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Mon Jan 19 15:54:34 2015 +0200

    coveralls => codecov

commit 75a8169c2a35611ed63213470d7ae01950a59a67
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Mon Nov 10 17:29:53 2014 +0200

    Sloppy rebase

commit cc67124161be9e2f98a67391db9858e5510457a4
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Fri Nov 7 22:22:44 2014 +0200

    Add tests

commit 2987615f624ff925b59905467be6d35dbe220bca
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Fri Nov 7 21:46:28 2014 +0200

    Rename `input_dir` everywhere

commit 809701f6bdc78c0910ee1d829a05befe4998e509
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Fri Nov 7 21:42:53 2014 +0200

    Remove argument parsing tests

commit 5bc535b3994b39f5d6a4a3cd436ec0e82a623c08
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Fri Nov 7 21:42:41 2014 +0200

    Rename `input_dir` to template

    And remove `click.Path` validation

commit 6706f1d400d0d03582d8c08dd413a607b9929190
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Fri Nov 7 21:33:13 2014 +0200

    Implement the cli with click

commit 9317f39edfa9f6f8444d21fce06a8068ae9f5913
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Fri Nov 7 21:07:50 2014 +0200

    Add click and remove argparse

commit 3b508b8e721fe5ff779d0e68fee652bd481ab0af
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Fri Jan 16 09:15:31 2015 -0800

    Added @jpzk's addition of their scala package

commit 75f492787442881aff907f295cbcf47de797d2a3
Merge: db55137 8a6e26a
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Fri Jan 16 09:11:48 2015 -0800

    Merge pull request #365 from jpzk/master

    added cookiecutter template for Apache Spark Scala applications

commit db551375c3744735c1113d3a6c047a9693c00159
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Thu Jan 15 09:25:11 2015 -0800

    Update the license dates

commit 8a6e26a8378ac6d87ebf183fb9c4c647f6eb2694
Author: Jendrik Poloczek <jendrik@pilzspore.de>
Date:   Wed Jan 14 10:32:52 2015 +0100

    added cookiecutter template for Apache Spark Scala applications

commit 5d63102f6e92eb5eb9b73da0133616b18ec6ae6e
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Jan 13 15:20:42 2015 -0800

    flake8 fix

commit d1e8eb45cd73d4534387566feb64f11558b40473
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Jan 13 08:04:36 2015 -0800

    Changed 2.6 deprecation warning to raise an exception

commit 7db8ef4475b433668fb110d9dbaf188f7010e18c
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Jan 13 08:00:04 2015 -0800

    Removed support for Python 2.6 as requested in #201

commit da00bcb39895f4389a03e09ac37fa535b4e38984
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Jan 13 07:31:13 2015 -0800

    Corrected RST mistakes that caused the PyPI long release RST to fail.

commit 678a8f2899889ca9a02af49d643defb622f1a3a1
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Tue Jan 13 07:25:31 2015 -0800

    Begin formal 1.0.0 scope in documentation and python version. Changed to pull DeprecationWarning for Python 2.6 users

commit af3ccbab1de5e96d3d05271d4979ca3330b61dc2
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 26 23:31:18 2014 +0100

    Get rid of coverage in standard test and leave it to make coverage

commit 3181c52fe13e4be3c5d3279b25a5fd45a86290c0
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 26 23:30:47 2014 +0100

    Run tests via setup.py in make

commit 1d1e2bc6dc77c7fed6b3b80804af42e743d833cc
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 26 20:36:19 2014 +0100

    Remove pytest ini to be able to use pytest as usual

commit 185d7c9342c795aed60ad7cc2ec77946749f7ed9
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 26 20:36:03 2014 +0100

    Implement PyTest Command running tests via setup

commit a864c6b57271c57ed8dd525385843ea46a75384e
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 25 21:42:34 2014 +0100

    Add finalizer to remove the rc created by the tests

commit b77873d6fe9dfecc5b743eb4593e327ccbb31a65
Author: José Padilla <jpadilla@webapplicate.com>
Date:   Tue Nov 25 09:59:54 2014 -0400

    Add cookiecutter-django-rest-framework

commit c809921904eb78e5cfcab75531188d1a94f7a882
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:52:20 2014 +0100

    Optimize formatting a bit

commit b7b96f9b8d10ea48445c945770db9c4cd6bfc9f7
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:39:06 2014 +0100

    Remove original unittest module

commit fcb1b5c790857fb1c2447f3ca037566e109daca5
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:34:51 2014 +0100

    Use back_up_rc and convert test_get_user_config_nonexistent

commit b07f54ed6cc166239b97df23b5276bb69558554c
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:21:07 2014 +0100

    Convert test_get_user_config_invalid to py.test

commit d774347795925a03103f84f0a94b7e15d4bb4857
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 23:05:01 2014 +0100

    Use ticks instead of double quotes

commit 4d97beb05d169d33ddf364b0eae0dc56a8897e51
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 22:55:20 2014 +0100

    Convert test_get_user_config_valid with fixture

commit 05dbb8055f4e1c61d04daf8324169c7834b5393b
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 20:08:19 2014 +0100

    Remove self references from setup/teardown

commit 015fa0737f219825e9669cc5ebc96335ff410d14
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 19:59:14 2014 +0100

    Create new module for TestGetUserConfig with setup/teardown

commit a414236dd3d03c27c49de139f8bcdfac60437293
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 08:30:42 2014 +0100

    Use ticks instead of double quotes for str literals

commit cd59c5ae599f759fc9e41bda2e6cf4bdae92a4ec
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 08:23:24 2014 +0100

    Convert TestGetConfigWithDefaults to pytest

commit aefc004aaf76aefcc7ee47e9c7e494499574ca99
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 08:15:20 2014 +0100

    Convert test_invalid_config

commit aaa71eed1c5054e917935db9506f4cff85bb1119
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 24 08:11:40 2014 +0100

    Convert test_get_config_does_not_exist

commit 60c4735ae25c7ff68eaebf6b174c3181bc15c83f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Nov 23 20:02:26 2014 +0100

    Convert test_get_config to py.test

commit 0208a3884b9fb648452297a6e1c2358c61d0d124
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 22 01:03:45 2014 +0100

    Remove redundant asserts

commit 3b3e87c4decb0b19297de2114fc912727bf6f599
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 22 01:02:19 2014 +0100

    Remove former second test and unused imports

commit c375b3dddd292167c0df298165153922e82ffd26
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 22 00:58:36 2014 +0100

    Implement a parametrized fixture to cover both tests

commit 6318181c73371ec5bf4ead97177f72f96c10e392
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 22 00:43:15 2014 +0100

    Use os.path.join instead of replacing separators

commit 85b2d677cfe83eb16d8bba59354f0f36ac3918b3
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 22 00:23:08 2014 +0100

    Convert TestFindTemplate to py.test syntax

commit dc6d9ec75ffb2ac776d10a924395d05284bc031e
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Fri Nov 21 23:45:29 2014 +0100

    Remove unused import of compat unittest

commit ce8dcba62df31e19b8f571bacfb57ac2d4681918
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Fri Nov 21 23:43:47 2014 +0100

    Convert TestWhich to py.test

commit 2fa57fca6a5dfb4719ce1045b818a8d947afe692
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Thu Nov 20 22:55:14 2014 +0100

    Convert test_cookiecutter_mercurial to pytest

commit 2c37ed091baf12e53885bfa06fdb835bb8de1218
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Thu Nov 20 22:47:41 2014 +0100

    Add Bitbucket to skipif marker reason

commit fbbcc9b3a788d4b2e8d148bc9f9d7f43663dab25
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Thu Nov 20 22:46:05 2014 +0100

    Convert test_cookiecutter_git with fixtures and patch

commit f647845aa815f12abac602f83418ea8007e8f765
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 19 23:37:09 2014 +0100

    Use separate tests instead of parametrized fixture

commit 448e3515d365a6fa90bf39aea68ee0864f435d76
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 18 23:58:38 2014 +0100

    Extend doc string for a better comprehensibility

commit 6b7bff80f07362b37ffcb1a2c33f408b357add6c
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 18 23:47:06 2014 +0100

    Update module doc str with contained tests

commit 595facdbd95ec71255a05e32c597bf811c0d63f9
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 18 23:37:20 2014 +0100

    Convert prefix_not_0_in_braces test

commit b60e70d258877333ed61777f79bc9c7fcf2fe98f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 18 23:23:03 2014 +0100

    Integrate similar tests into fixture

commit b52ecfdbcb728f84d0d5d766bc3198f455d009f2
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 18 22:55:12 2014 +0100

    Convert to parametrized test based on first test

commit 1646f7e6959773164bab5bd4c0b85ef244366cf4
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 18 22:20:54 2014 +0100

    Use correct module name in doc string

commit 5361894bd1232f198c2bd56c4ebe6784ac60b3fb
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 17 22:32:15 2014 +0100

    Change comparision to 'is' in order to fix flake8

commit 220befc6a8d95208bcd94847c211161aca3e710b
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 17 21:58:32 2014 +0100

    Convert TestArgParsing to pytest

commit 8076a98c401bb6d07619d9dfd57e97ec6c7dcf86
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Mon Nov 17 10:16:14 2014 +0200

    Leave it to py.test discovery

commit df4aada66f6087a5afbde721e7bc88812e875eb4
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 17 08:27:36 2014 +0100

    Set no_input=False as specified in the doc str

commit 51adfe2d755595ab15c09e65db43f8c767ebaef8
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 17 08:21:08 2014 +0100

    Convert test_cookiecutter_input_extra_context

commit 3431bfaea472f43e90a985a7cc60718d9fd2b73d
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 17 08:18:25 2014 +0100

    Convert test_cookiecutter_local_with_input using monkeypatch

commit 376316ce465142b8f3438ac87b8f9351e02580c3
Merge: c67c5cc feacc6a
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Mon Nov 17 09:10:56 2014 +0200

    Merge pull request #331 from hackebrot/hackebrot-fix-duplicate-author-mention

    Remove duplicate mention of @hackebrot

commit 6b9c7c3cc40fc91654741cb6f49bcdd1090564e5
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 17 07:39:05 2014 +0100

    Fix grammar in doc string

commit feacc6a06cf16d085cb0765987e655ca066671b1
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 17 06:51:01 2014 +0100

    Remove duplicate mention of @hackebrot

commit c67c5cc36a74553b28b612d10bd4fbef282091bd
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Nov 16 23:08:15 2014 -0300

    Update HISTORY.rst

commit 194bd7e638069df030b877dbeff3455dbab28098
Merge: cb14d23 68f2d61
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Nov 16 23:07:02 2014 -0300

    Merge pull request #326 from michaeljoseph/generate-pytest-coverage

    Generate pytest coverage

commit cb14d23fca0c1aa4ecc2775f90a06e3440fcb40a
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Nov 16 22:59:26 2014 -0300

    Update HISTORY.rst

commit e26cf4de6405a7834654b48ac4d1b3dd17418b45
Merge: 3f3772b b242607
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Nov 16 22:51:42 2014 -0300

    Merge pull request #329 from michaeljoseph/26-pending-deprecation

    Warn that we're dropping py26

commit 3f3772b943eaa9cec476df32654a1e14e3fcf566
Merge: 47e2e15 9e8d7e5
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sun Nov 16 22:41:08 2014 -0300

    Merge pull request #330 from michaeljoseph/changelog-process

    Changelog process and update

commit 10c936adbe51a842190d39e966e85aac0ccb06a7
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Nov 16 19:17:35 2014 +0100

    Convert test_cookiecutter_templated_context

commit 659832ff0b181dab3c8dac7defde170a7218aa35
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Nov 16 19:12:53 2014 +0100

    Convert test_cookiecutter_no_input_extra_context

commit cbe6be1f9a2b501c5c8405e1da08c9606f6a7e66
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Nov 16 18:44:28 2014 +0100

    Convert test_cookiecutter_no_slash with parametrized fixture

commit 112f2a2bf291d9e15a97bf34c02398966dae54ab
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sun Nov 16 18:25:02 2014 +0100

    Convert test_cookiecutter along with its teardown

commit 9e8d7e5f04e21016485846f35507d4db8d783813
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Nov 16 16:46:06 2014 +0200

    Link gitter

commit abc5283662c560e44f30a56beb7c703237c97098
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Nov 16 16:45:37 2014 +0200

    #291 is a feature

commit 37206aa09be3a330e7b85fa97af11d0ba7a87006
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Nov 16 16:39:40 2014 +0200

    Changelog and authors for #303 and #322

commit 758e7254579e9f7567cb39bca3325491cf5fd383
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Nov 16 16:32:14 2014 +0200

    Typos

commit 38bce619c426661c359fb10369f28661a738d618
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Nov 16 16:31:54 2014 +0200

    Document pull request and history process

commit b242607648be06fac58fc77eeded7238b8f2c1fe
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Nov 16 14:43:31 2014 +0200

    Warn that we're dropping py26

commit 47e2e15a94639259b1abda8cd826f62c9bdbb241
Merge: f7b6e0d 4efaf42
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sun Nov 16 11:09:14 2014 +0200

    Merge pull request #322 from hackebrot/hackebrot-convert-tests-to-pytest

    Hackebrot convert tests to pytest

commit 4efaf42a84b2c969fe959841aa2c70b7e9b19b17
Merge: 6d6a5e2 f7b6e0d
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 23:51:00 2014 +0100

    Incorporate latest changes from upstream master

commit 6d6a5e23ecf96b53290c6ec6c311bba2f512e169
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 23:45:13 2014 +0100

    Amend doc strings stating where the tests originate from

commit f7b6e0d6bc84c55aab22e99e80ca03fa587c5adb
Merge: 15aef71 5039759
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Nov 15 23:49:13 2014 +0200

    Merge pull request #303 from audreyr/issue-149-check-vcs-existence

    Issue 149 check vcs existence

commit 15aef71eeaf6120fe9cf30e6da3f7d3bdeda6903
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Nov 15 17:33:16 2014 -0300

    @michaeljoseph's history and authors changes

commit 503975988e23efa2ee16f9f19255ecd34d665b4d
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Nov 15 17:17:33 2014 -0300

    Removed accidental inclusion of merge content

commit 9927cfecf75e9a1e9fc1491abd449c5161877107
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Nov 8 11:52:08 2014 -0300

    Switched to use a direct port of the Python 3 'which' function

commit 9de9824fb5492ba3845cf7a637594947d082b34c
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Nov 1 10:05:27 2014 -0300

    Add the missing API doc

commit 58a1d1c9378802497d9111ec4ac4018f1b2d03d6
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Nov 1 09:57:34 2014 -0300

    Better testing of compat module

commit 96f042099e5be9f31706aae3b2a9a4d0184ea5fa
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Fri Oct 31 10:27:04 2014 -0700

    Added vcs.is_vcs_installed function to provide verbose exceptions for users without git or hg installed.

commit 67c93fa81d22bd7e930bae4f437cbd5647de0270
Merge: 85af40f dfd5ef2
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Nov 15 14:37:59 2014 -0300

    Merge branch 'master' of github.com:audreyr/cookiecutter

commit 85af40f65d2d2a33f91d675c49631345b62db3ed
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Nov 15 14:36:56 2014 -0300

    Updated the history

commit dfd5ef2d83674d8445f706ea0f2afa3474b8e309
Merge: c77d1f3 b911d37
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sat Nov 15 14:29:45 2014 -0300

    Merge pull request #328 from michaeljoseph/coding-standards

    Coding standards

commit c77d1f389fcf4a91100693722e3c3dc8966b5cf0
Merge: fd7002d 8a89725
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Sat Nov 15 14:28:57 2014 -0300

    Merge pull request #318 from michaeljoseph/rtfd-badge

    Add the RTFD badge

commit fd7002d03acfe2d4c73571533261f1989b46af54
Author: Daniel Greenfeld <danny@eventbrite.com>
Date:   Sat Nov 15 14:25:08 2014 -0300

    Removed test directory

commit f32685ef4ad847bd237845da6b5b8c44dac0ea9b
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 17:13:29 2014 +0100

    Fix travis, make sure skipif condition resolves to a bool

commit 8006b9e2d8e04be2fc70278c8e59dbed40f5a059
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 16:21:49 2014 +0100

    Remove former test_branch and examples_repo_arg

commit 3174e11deee144581417a57c9a829956b4509dca
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 16:21:25 2014 +0100

    Merge test_branch and examples_repo_arg to one module

commit d4a186100eadff83057ffd6f799ebcba77c9e99c
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 16:15:54 2014 +0100

    Remove original test_examples and convert examples_repo_arg

commit 9695bfdd5b9283670ca7c9a91d6c308400a32ead
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 15:56:46 2014 +0100

    Convert test_branch for git to pytest

commit dd0f83db4a28e5b66498cee031542bbab8fb19bc
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 15:33:13 2014 +0100

    Remove former jquery and pypackage test modules

commit d15206e59278baf65c871cf0da625b1d10a0fe3f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 15:32:33 2014 +0100

    Merge jquery and pypackage tests using parametrize

commit 715dfa241553c7b82a01c34f37efd41eae1be8ce
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 15:07:03 2014 +0100

    Convert test_cookiecutter_jquery along with teardown

commit b911d371d2a63ae80d78fd560dca5793326ecbd9
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Nov 15 15:51:17 2014 +0200

    First attempt at coding standards

    Fixes #219

commit f13982144a2a0710af8e082dd01d73f036f026fd
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 14:48:49 2014 +0100

    Use clean_system fixture on pypackage test

commit dcc4106d91e037df3a73c6e30e38a8ed9c85db51
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 14:32:15 2014 +0100

    Extract skipif markets to a separate module

commit 2cfa8d867282b1ece25417b1b18ece4573c540f9
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 13:30:04 2014 +0100

    Convert test_cookiecutter_pypackage along with teardown

commit 68f2d614c7d8899d834c3212f38fc6ff11f583ce
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Nov 15 13:18:35 2014 +0200

    Try inlining coverage reporting flags

commit a722819adca9bc641e5d2f636b2d00052b82e58d
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Sat Nov 15 13:06:27 2014 +0200

    Configure pytest to generate coverage

commit 48374b04fe20864e5b706831bc48a0278bbe4325
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 11:58:22 2014 +0100

    Remove import of unused utils

commit 27baef42c07d2ef879a585ccd9962a2f9ac5c92c
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 11:37:03 2014 +0100

    Use a fixture for the expected error message

commit ade30d982931b286707afea902cd89d06535634e
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 11:33:24 2014 +0100

    Use a fixture for the environment

commit ee8adcaa217cefa54d38e8c24177646c922e162f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 11:17:53 2014 +0100

    Convert template_syntax_error test and fix exception handling

commit a5edeea87a436fde399189d10b012ff97fa33b2c
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 10:56:14 2014 +0100

    Convert test_generate_file along with cheese teardown

commit b7588ff088dc47a4c1d5f2f675f4b0174ee5bf18
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 10:42:19 2014 +0100

    Remove logging from test_output_folder

commit dcdddb987b16781fb0da9212646980eb7b06aaca
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 00:23:55 2014 +0100

    Convert test_run_shell_hooks and move helper make_test_repo

commit 36f355762fa96496d132639999e9c76f3884e4c9
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Sat Nov 15 00:04:19 2014 +0100

    Convert test_run_python_hooks_cwd to pytest

commit be2544a5b32cc393004f73cfe4909f9ce0c18034
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Fri Nov 14 23:50:47 2014 +0100

    Convert test_run_python_hooks to pytest

commit 11e531cbe6c534b68d3244f2e05eb436cd76647d
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Fri Nov 14 23:25:33 2014 +0100

    Convert test_ignore_hooks_dirs using fixture teardown

commit 61340d77ca3220e7820e75ee2949f8c499252b2c
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Fri Nov 14 22:25:39 2014 +0100

    Optimize code formatting regarding line length

commit 02895d16ff55120586cd784a8b12385d9ecb3437
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Fri Nov 14 22:00:22 2014 +0100

    Extend documentation for conftest fixture with teardown

commit 5e99c5fb205560b81641f72b1b280c5346bb6121
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Fri Nov 14 00:07:41 2014 +0100

    Remove original TestOutputFolder

commit 8903bfa459975386a8fb66d6bcb8b6a725ae6389
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Fri Nov 14 00:06:24 2014 +0100

    Convert test_output_folder using fixture teardown

commit f5f983b91602bc62a6e24c399918d2db2b9df226
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Thu Nov 13 23:08:32 2014 +0100

    Replace double quotes with single quotes for short str literals

commit fdc10c1e01d8de8b619a94052521981af10fda31
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Thu Nov 13 13:38:31 2014 +0200

    Coding standards

commit f8c331755dc2b6e2e7b98c37577759cb41075cd0
Merge: a28f91a b13dd0d
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 22:54:01 2014 +0100

    Incorporate latest changes from upstream master to fix ci build

commit a28f91ac597fa9d98756339aa2e51828cf509b5f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 22:48:04 2014 +0100

    Parametrize test data for generate_context

commit 92e1e98c576af34dcf411cfc422e7e22809645bc
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 22:07:23 2014 +0100

    Convert test_generate_context_with_default_and_extra

commit 0f4e345660975592d3f63315fe0c2b80dd8937ee
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 22:05:54 2014 +0100

    Convert test_generate_context_with_extra

commit 4ce6654a80c165fcc137309d4c3c790274cca1b5
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 21:58:47 2014 +0100

    Replace test_generate_context_with_default with pytest implementation

commit 02fbaa32ad0c2e64b8dd8be9cf833d9780009a32
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 21:55:09 2014 +0100

    Replace test_generate_context with pytest implementation

commit b13dd0df19f58e48ad147e37482e9f7c0da32f1b
Merge: 5c4e96a cc2a1d6
Author: Michael Joseph <michaeljoseph+github@gmail.com>
Date:   Wed Nov 12 10:53:21 2014 +0200

    Merge pull request #310 from ramiroluz/issue_256

    Document py.test usage instructions. #256

commit b347c4294f4660e5fff53d036c6ac465a2d3ddb7
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 01:58:59 2014 +0100

    Update doc strings to reflect fixture changes

commit c6ffc0782ac5f9eccb5df432287f660879ce5282
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 01:54:42 2014 +0100

    List fixtures instead of reusing clean_system in remove

commit 4ae71ec08395625f600109fe0681a661f9f0ff1b
Merge: b26b264 5c4e96a
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 00:43:51 2014 +0100

    Incorporate latest changes from upstream master

commit b26b2644c3e84758a95d8d98c1f608b10b3ea427
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Wed Nov 12 00:05:44 2014 +0100

    Use local variables to come below pep8 line length

commit 8c202fb5dfdab014d16a92f0df216f4b7b44d505
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 23:48:01 2014 +0100

    Convert last test of TestGenerateFiles to pytest

commit e7dbbc910775aea72e9da5d8de22c3432745db21
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 23:34:31 2014 +0100

    Replace original output dir test with pytest implementation

commit 345da6805eb96c6126907b510a852e88199a52ed
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 23:24:13 2014 +0100

    Replace original absolute path test with pytest implementation

commit fea68124dc41cdc157663fd5afb2fb848ceaf7bb
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 23:14:17 2014 +0100

    Remove original binaries test

commit 2e7ea503ecc2e554ef357f8e40653b749f29f1c7
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 23:11:33 2014 +0100

    Convert binaries test to pytest syntax

commit b77d6943cfff31e22c37e97bbcf6d5901cd1f9b5
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 23:00:08 2014 +0100

    Copy original binaries test

commit d9e18d92f2aabc8a9ea4a8a86a67984b90c4674f
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 22:37:43 2014 +0100

    Remove original trailing newline test

commit 1b4759fe8253b0b1bfd1d0b4f94e6a867754eaca
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 22:36:37 2014 +0100

    Reimplement trailing newline test with pytest

commit 2c8fdee98c2f329f837532f771842586a0335856
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 22:20:19 2014 +0100

    Remove original test

commit 51d8d354f1a75b83becad880eec7cbac86d52e74
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 22:15:59 2014 +0100

    Convert test to pytest syntax

commit 58b90b23146ee618812646f3a4579fbe3ee32a0b
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Tue Nov 11 22:06:12 2014 +0100

    Copy original test_generate_files and adapt doc str

commit cc2a1d61b733a368d2c632b90e4942cd03ca13b5
Merge: 8032358 cc7d04d
Author: Ramiro Batista da Luz <ramiroluz@gmail.com>
Date:   Tue Nov 11 16:09:31 2014 -0200

    Fix merge conflict

commit 803235848555d343c28f4693a7cdf47a537d17d6
Merge: acd0e04 f90d1c6
Author: Ramiro Batista da Luz <ramiroluz@gmail.com>
Date:   Tue Nov 11 16:08:25 2014 -0200

    Merge with branch fix_ci of @michaeljoseph

commit acd0e040c104cd210f075f966beeb0feeb1b6d2f
Author: Ramiro Batista da Luz <ramiroluz@gmail.com>
Date:   Tue Nov 11 15:06:06 2014 -0200

    Update documentation.

commit cc7d04dbfdd12a289323854c28b572a9c676a65a
Author: Ramiro Batista da Luz <ramiroluz@gmail.com>
Date:   Tue Nov 11 15:06:06 2014 -0200

    Update documentation, fix the flake8 configuration.

commit ee318e705170dd22e40b07f5c844f276195919fb
Merge: de1ff45 5c4e96a
Author: Ramiro Batista da Luz <ramiroluz@gmail.com>
Date:   Tue Nov 11 10:39:28 2014 -0200

    Merge branch 'master' into issue_256

commit 5c4e96ad370b9bf30302e4839f0b1c958ad90581
Merge: a70b496 7eff322
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Tue Nov 11 07:17:26 2014 -0300

    Merge pull request #324 from thedrow/patch-2

    Added missing trove classifiers.

commit a70b496b0027149835d6584842d702337fac0256
Merge: 2d12bd4 1468c3a
Author: Daniel Greenfeld <pydanny@users.noreply.github.com>
Date:   Tue Nov 11 07:16:59 2014 -0300

    Merge pull request #323 from thedrow/patch-1

    Updated supported Python versions in the README file

commit 7eff322388fdc95de281795031bc1e9d5087dc23
Author: Omer Katz <omer.drow@gmail.com>
Date:   Tue Nov 11 10:00:28 2014 +0200

    Added missing trove classifiers.

commit 1468c3a7e09398c26bdeea4136de1671a5c3ca41
Author: Omer Katz <omer.drow@gmail.com>
Date:   Tue Nov 11 09:57:01 2014 +0200

    Updated supported Python versions in the README file.

commit 05cbb6e11cf752cd40d2259bcc0a4b414640a891
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 10 22:59:18 2014 +0100

    Extend the doc str to explain the order of fixture calls audreyr/cookiecutter#256

commit 54396cd684dcd83c7b06b046ef258e84df18c7ea
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 10 22:33:18 2014 +0100

    Remove original nontemplated exception test

commit 329e74f280537aab41d5b810f8650bfd8d6d81f5
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 10 22:27:44 2014 +0100

    Add teardown specific to the former TestCase class

commit 3ffa2bedd162191fa57fc8bf7c9ada15cfaa9e02
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 10 22:18:03 2014 +0100

    Convert original test to pytest syntax

commit 4227098ca1985cfcdab009af8ecf1155a943a148
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 10 21:49:57 2014 +0100

    Remove self reference for cookiecutters dirs

commit a4bf689ee8a87f0089ab2318dc57a26111b6a10a
Author: Raphael Pierzina <raphael@hackebrot.de>
Date:   Mon Nov 10 21:45:54 2014 +0100

    Remove self reference for found variables

commit f6c0a7c12b2bef07a03dca…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
developers This issue/PR has request to other project developers enhancement This issue/PR relates to a feature request.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants