[Python-modules-commits] [cookiecutter] branch master updated (f6b6baf -> a6782d1)

[Vincent Bernat]

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

bernat pushed a change to branch master
in repository cookiecutter.

      from  f6b6baf   d/rules: enforce use of py.test for tests
       new  db64fef   Import cookiecutter_1.2.1.orig.tar.gz
       new  e0a6f17   record new upstream branch created by importing cookiecutter_1.2.1.orig.tar.gz and merge it
       new  12fc325   New upstream version
       new  78b5a35   Create a fake home to let some tests be happy.
       new  8038fb8   Don't test for ".DS_Store"
       new  69d32a7   merge patched into master
       new  37e46a0   Don't test for ".DS_Store"
       new  9266826   merge patched into master
       new  a6782d1   No need to create a HOME directory

The 9 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .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 ++--
 debian/changelog                                   |  6 +-
 debian/control                                     |  1 +
 debian/patches/0001-Don-t-test-for-.DS_Store.patch | 26 ++++++
 debian/patches/series                              |  1 +
 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                       | 17 +++-
 tests/test_more_cookiecutters.py                   |  4 +-
 23 files changed, 301 insertions(+), 51 deletions(-)
 create mode 100644 debian/patches/0001-Don-t-test-for-.DS_Store.patch
 create mode 100644 debian/patches/series
 create mode 100644 tests/files/{% if generate_file == 'y' %}cheese.txt{% endif %}
 create mode 100644 tests/test-generate-context/choices_template.json
 mode change 100644 => 100755 tests/test_generate_file.py

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