[Python-modules-commits] [cookiecutter] 01/09: record new upstream branch created by importing cookiecutter_1.2.1.orig.tar.gz and merge it

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository cookiecutter.

commit e0a6f1790e34a0635b29fa2827b0574eb7327453
Merge: f6b6baf db64fef
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Nov 15 23:18:40 2015 +0100

    record new upstream branch created by importing cookiecutter_1.2.1.orig.tar.gz and merge it

 .travis.yml                                        |  3 +-
 AUTHORS.rst                                        |  4 +
 HISTORY.rst                                        | 38 ++++++++-
 README.rst                                         | 15 ++--
 cookiecutter/__init__.py                           |  2 +-
 cookiecutter/config.py                             |  5 +-
 cookiecutter/generate.py                           | 34 +++++++-
 cookiecutter/main.py                               |  2 +-
 debian/.git-dpm                                    | 14 ++--
 setup.py                                           | 14 +++-
 ...if generate_file == 'y' %}cheese.txt{% endif %} |  1 +
 tests/test-generate-context/choices_template.json  |  7 ++
 tests/test_cookiecutter_local_no_input.py          |  7 ++
 tests/test_cookiecutter_repo_arg.py                | 19 +++--
 tests/test_cookiecutters.py                        | 12 ++-
 tests/test_generate_context.py                     | 93 ++++++++++++++++++++++
 tests/test_generate_file.py                        | 27 +++++++
 tests/test_generate_files.py                       | 15 ++++
 tests/test_more_cookiecutters.py                   |  4 +-
 19 files changed, 270 insertions(+), 46 deletions(-)

diff --cc debian/.git-dpm
index 0abf2c1,0000000..2293d45
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e54282d9b5cb0425475785de006a787e953b6e92
- e54282d9b5cb0425475785de006a787e953b6e92
- e54282d9b5cb0425475785de006a787e953b6e92
- e54282d9b5cb0425475785de006a787e953b6e92
- cookiecutter_1.1.0.orig.tar.gz
- 243f48383335c36ffdf3ee074c8ca698e7b48035
- 213420
++db64feff584643eec95fb180dd7e84f2a7c4ba8a
++db64feff584643eec95fb180dd7e84f2a7c4ba8a
++db64feff584643eec95fb180dd7e84f2a7c4ba8a
++db64feff584643eec95fb180dd7e84f2a7c4ba8a
++cookiecutter_1.2.1.orig.tar.gz
++82e1dacab7adc0b6453b3c81c0c9acc5eaf4114e
++215412
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cookiecutter.git