[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 4044a37f98e593e6bf79b4abd95dc76c886a768f
Merge: 0effcf0 d189085
Author: Vincent Bernat <bernat at debian.org>
Date:   Mon May 2 08:05:08 2016 +0200

    merge patched into master

 .gitignore                                         |  68 +++++++-----
 AUTHORS.rst                                        |  14 +++
 HISTORY.rst                                        |  97 ++++++++++++++++-
 README.rst                                         |  37 +++++--
 appveyor.yml                                       |   2 +
 cookiecutter/__init__.py                           |   2 +-
 cookiecutter/cli.py                                |  24 ++++-
 cookiecutter/config.py                             |  29 ++++--
 cookiecutter/environment.py                        |  52 +++++++++
 cookiecutter/exceptions.py                         |  27 +++++
 cookiecutter/generate.py                           |  63 +++++++----
 cookiecutter/main.py                               |  26 +++--
 cookiecutter/prompt.py                             |  37 ++++---
 cookiecutter/replay.py                             |  14 +--
 debian/.git-dpm                                    |   6 +-
 debian/patches/0001-Don-t-test-for-.DS_Store.patch |   4 +-
 docs/advanced_usage.rst                            | 116 ++++++++++++++++++++-
 docs/cookiecutter.rst                              |   8 ++
 docs/troubleshooting.rst                           |   4 +-
 docs/usage.rst                                     |   2 +-
 setup.cfg                                          |   2 +-
 setup.py                                           |  24 ++---
 .../{{cookiecutter.repo_dir}}/README.rst           |   4 +-
 tests/replay/conftest.py                           |  11 +-
 tests/replay/test_dump.py                          |  23 ++--
 tests/replay/test_load.py                          |  16 +--
 tests/replay/test_replay.py                        |   4 +-
 tests/test-config/config-expand-user.yaml          |   2 +
 tests/test-config/config-expand-vars.yaml          |   2 +
 tests/test-extensions/default/cookiecutter.json    |   4 +
 .../{{cookiecutter.project_slug}}/HISTORY.rst      |   7 ++
 tests/test-extensions/unknown/cookiecutter.json    |   6 ++
 .../{{cookiecutter.project_slug}}/HISTORY.rst      |   7 ++
 .../input{{cookiecutter.binary_test}}/readme.txt   |   2 +-
 .../{{cookiecutter.binary_test}}/readme.txt        |   2 +-
 tests/test_cli.py                                  |  48 +++++++++
 tests/test_default_extensions.py                   |  41 ++++++++
 tests/test_environment.py                          |  24 +++++
 tests/test_exceptions.py                           |  21 ++++
 tests/test_generate_file.py                        |   4 +-
 tests/test_generate_files.py                       |  79 ++++++++++++++
 tests/test_get_config.py                           |   7 +-
 tests/test_get_user_config.py                      |  41 +++++---
 tests/test_main.py                                 |  41 ++++++--
 tests/test_prompt.py                               |  55 ++++++++--
 tests/test_repo_not_found.py                       |  10 ++
 .../{{cookiecutter.project_slug}}/README.rst       |   2 +
 .../{{cookiecutter.foobar}}/helloworld.py          |   0
 .../{{cookiecutter.project_slug}}/README.rst       |   6 ++
 .../undefined-variable/file-name/cookiecutter.json |   4 +
 .../{{cookiecutter.foobar}}                        |   2 +
 tox.ini                                            |   1 +
 52 files changed, 936 insertions(+), 198 deletions(-)

diff --cc debian/.git-dpm
index eddf7ac,0000000..f7ca20b
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
- 21abd3c3c0b9865cd6e59c15dc45a4bf3eedf4ee
- 21abd3c3c0b9865cd6e59c15dc45a4bf3eedf4ee
- 1016a2016d22987f1c56f7208ef8693ab9101f96
++d189085cd62e6d083391e026349b2f6da56f3a5f
++d189085cd62e6d083391e026349b2f6da56f3a5f
++2cff56151f5e99b0914d57e6202c4ce7abd84935
 +2cff56151f5e99b0914d57e6202c4ce7abd84935
 +cookiecutter_1.4.0.orig.tar.gz
 +b19b6fb4e912400514d2443be245536bc9cabfd5
 +226136
 +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 32f5a45,0000000..d6d6427
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 21abd3c3c0b9865cd6e59c15dc45a4bf3eedf4ee Mon Sep 17 00:00:00 2001
++From d189085cd62e6d083391e026349b2f6da56f3a5f 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
++index 0d624532a9cd..84fe8a9c9d37 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