[Python-modules-commits] [cookiecutter] 04/06: merge patched into master

[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 54e0cb421384f756b933582add2e90c9027def79
Merge: 536d0ae 21abd3c
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Dec 5 17:09:57 2015 +0100

    merge patched into master

 CONTRIBUTING.rst                                   |   8 ++
 HISTORY.rst                                        |  41 +++++++++
 Makefile                                           |  18 +++-
 README.rst                                         |  16 ++++
 appveyor.yml                                       |  14 ++-
 cookiecutter/__init__.py                           |   2 +-
 cookiecutter/cli.py                                |  30 +++++-
 cookiecutter/config.py                             |  39 +++++---
 cookiecutter/exceptions.py                         |   6 ++
 cookiecutter/generate.py                           |  25 +++--
 cookiecutter/hooks.py                              |  15 ++-
 cookiecutter/main.py                               |   8 +-
 cookiecutter/vcs.py                                |   1 +
 debian/.git-dpm                                    |   6 +-
 debian/patches/0001-Don-t-test-for-.DS_Store.patch |   2 +-
 docs/advanced_usage.rst                            |  48 +++++++++-
 docs/conf.py                                       |   2 +-
 docs/cookiecutter.rst                              |   8 --
 docs/requirements.txt                              |   2 +
 docs/types_of_contributions.rst                    |   8 ++
 setup.cfg                                          |  11 +++
 setup.py                                           |  19 ++--
 tests/hooks-abort-render/hooks/post_gen_project.py |  12 +++
 tests/hooks-abort-render/hooks/pre_gen_project.py  |  12 +++
 .../{{cookiecutter.repo_dir}}/README.rst           |   2 +
 tests/skipif_markers.py                            |  14 +--
 tests/test_abort_generate_on_hook_error.py         |  46 ++++++++++
 tests/test_cli.py                                  | 102 ++++++++++++++++++++-
 tests/test_cookiecutters.py                        |   7 +-
 tests/test_get_user_config.py                      |  53 +++++++++++
 tests/test_hooks.py                                |  16 +++-
 tests/test_more_cookiecutters.py                   |   7 +-
 tests/test_vcs.py                                  |  13 +++
 33 files changed, 535 insertions(+), 78 deletions(-)

diff --cc debian/.git-dpm
index 78f5333,0000000..6628483
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
- 37e46a0dfe41ba2f506e7ff330cea44084eb6444
- 37e46a0dfe41ba2f506e7ff330cea44084eb6444
- db64feff584643eec95fb180dd7e84f2a7c4ba8a
++21abd3c3c0b9865cd6e59c15dc45a4bf3eedf4ee
++21abd3c3c0b9865cd6e59c15dc45a4bf3eedf4ee
++1016a2016d22987f1c56f7208ef8693ab9101f96
 +1016a2016d22987f1c56f7208ef8693ab9101f96
 +cookiecutter_1.3.0.orig.tar.gz
 +b689427def574b25e616ab9e52324a2ab34aa88a
 +219110
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-test-for-.DS_Store.patch
index 6567719,0000000..32f5a45
mode 100644,000000..100644
--- a/debian/patches/0001-Don-t-test-for-.DS_Store.patch
+++ b/debian/patches/0001-Don-t-test-for-.DS_Store.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 37e46a0dfe41ba2f506e7ff330cea44084eb6444 Mon Sep 17 00:00:00 2001
++From 21abd3c3c0b9865cd6e59c15dc45a4bf3eedf4ee Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <vincent at bernat.im>
 +Date: Mon, 16 Nov 2015 00:02:17 +0100
 +Subject: Don't test for ".DS_Store"
 +
 +This file is excluded during extraction by dpkg-source.
 +---
 + tests/test_generate_files.py | 2 --
 + 1 file changed, 2 deletions(-)
 +
 +diff --git a/tests/test_generate_files.py b/tests/test_generate_files.py
 +index f75b0db440ce..9307af1e6327 100644
 +--- a/tests/test_generate_files.py
 ++++ b/tests/test_generate_files.py
 +@@ -113,11 +113,9 @@ def test_generate_files_binaries():
 +     )
 + 
 +     assert os.path.isfile('inputbinary_files/logo.png')
 +-    assert os.path.isfile('inputbinary_files/.DS_Store')
 +     assert os.path.isfile('inputbinary_files/readme.txt')
 +     assert os.path.isfile('inputbinary_files/some_font.otf')
 +     assert os.path.isfile('inputbinary_files/binary_files/logo.png')
 +-    assert os.path.isfile('inputbinary_files/binary_files/.DS_Store')
 +     assert os.path.isfile('inputbinary_files/binary_files/readme.txt')
 +     assert os.path.isfile('inputbinary_files/binary_files/some_font.otf')
 +     assert os.path.isfile(

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