[Python-modules-commits] [cookiecutter] 03/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 8aeb3c92ad7b5fe58916b73f8a05c34369796f0f
Merge: c09e08d e54282d
Author: Vincent Bernat <bernat at debian.org>
Date:   Fri Oct 9 19:38:20 2015 +0200

    merge patched into master

 .gitignore                                         |   1 +
 .travis.yml                                        |   4 +-
 AUTHORS.rst                                        |  32 ++-
 CONTRIBUTING.rst                                   |  99 ++++++--
 HISTORY.rst                                        |  96 +++++++-
 Makefile                                           |   6 +-
 README.rst                                         |  84 +++++--
 appveyor.yml                                       |  20 +-
 appveyor/install.ps1                               |  86 -------
 appveyor/setup_build_env.cmd                       |  16 --
 cookiecutter/__init__.py                           |   7 +-
 cookiecutter/cli.py                                |  71 +++---
 cookiecutter/compat.py                             | 140 ------------
 cookiecutter/config.py                             |   8 +-
 cookiecutter/exceptions.py                         |  13 ++
 cookiecutter/generate.py                           |  98 +++++++-
 cookiecutter/main.py                               |  64 ++++--
 cookiecutter/prompt.py                             | 152 +++++++++----
 cookiecutter/replay.py                             |  57 +++++
 cookiecutter/vcs.py                                |  14 +-
 debian/.git-dpm                                    |   6 +-
 ...e-to-use-an-existing-command-to-test-whic.patch |  39 ----
 debian/patches/accept-click-4.x.patch              |  25 --
 debian/patches/series                              |   3 -
 debian/patches/test-dont-expect-ds-store.patch     |  28 ---
 docs/advanced_usage.rst                            |  61 +++++
 docs/conf.py                                       |   4 +-
 docs/contributor_guidelines.rst                    |   3 +-
 docs/contributor_setup.rst                         |  15 +-
 docs/contributor_testing.rst                       |  24 +-
 docs/cookiecutter.rst                              |  10 +-
 docs/core_committer_guide.rst                      |  10 +
 docs/installation.rst                              |  27 ++-
 docs/troubleshooting.rst                           |   6 +
 logo/cookiecutter-logo-large.png                   | Bin 0 -> 93083 bytes
 logo/cookiecutter-logo.svg                         |  99 ++++++++
 setup.py                                           |  62 ++---
 tests/conftest.py                                  |  95 +++++---
 tests/replay/conftest.py                           |  31 +++
 tests/replay/test_dump.py                          | 101 +++++++++
 tests/replay/test_load.py                          |  65 ++++++
 tests/replay/test_replay.py                        |  63 ++++++
 tests/test-config/valid-config.yaml                |   1 +
 .../{{cookiecutter.repo_name}}/README.rst          |   5 +
 .../{{cookiecutter.repo_name}}/README.txt          |   5 +
 .../rendered/not_rendered.yml                      |   2 +
 .../README.rst                                     |   5 +
 .../{{cookiecutter.repo_name}}-rendered/README.rst |   5 +
 .../{{cookiecutter.repo_name}}-rendered/README.txt |   5 +
 .../{{cookiecutter.filename}}.py                   |   1 -
 tests/test-pyhooks/hooks/post_gen_project.py       |   1 -
 tests/test-pyhooks/hooks/pre_gen_project.py        |   1 -
 tests/test-pyshellhooks/hooks/post_gen_project.py  |   1 -
 tests/test-pyshellhooks/hooks/pre_gen_project.py   |   1 -
 tests/test-replay/cookiedozer_load.json            |   1 +
 tests/test-replay/invalid_replay.json              |   1 +
 tests/test_cli.py                                  | 184 ++++++++++++++-
 tests/test_compat.py                               |  19 --
 tests/test_cookiecutter_invocation.py              |  53 +++++
 tests/test_cookiecutter_local_with_input.py        |   8 +-
 tests/test_cookiecutter_repo_arg.py                |  11 +-
 tests/test_generate_context.py                     |  22 +-
 tests/test_generate_copy_without_render.py         |  71 ++++++
 tests/test_generate_files.py                       |   8 +
 tests/test_get_config.py                           |  13 +-
 tests/test_get_user_config.py                      |   1 +
 tests/test_main.py                                 |  29 +++
 tests/test_output_folder.py                        |  17 ++
 tests/test_preferred_encoding.py                   |  27 +++
 tests/test_prompt.py                               | 251 ++++++++++++++-------
 tests/test_read_user_choice.py                     |  41 ++++
 tests/test_read_user_variable.py                   |  24 ++
 tests/test_read_user_yes_no.py                     |  28 +++
 tests/test_specify_output_dir.py                   |  69 ++++++
 tests/test_vcs.py                                  |  38 ++++
 tests/test_vcs_prompt.py                           |  16 +-
 tox.ini                                            |  21 +-
 77 files changed, 2077 insertions(+), 754 deletions(-)

diff --cc debian/.git-dpm
index 927b6fb,0000000..0abf2c1
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
- 6e9a2488e6c8820c824d07af71ef76cb151e6ea6
- 6e9a2488e6c8820c824d07af71ef76cb151e6ea6
- e0b45044355244a6cee70afa49fca8d63ff44dca
++e54282d9b5cb0425475785de006a787e953b6e92
++e54282d9b5cb0425475785de006a787e953b6e92
++e54282d9b5cb0425475785de006a787e953b6e92
 +e54282d9b5cb0425475785de006a787e953b6e92
 +cookiecutter_1.1.0.orig.tar.gz
 +243f48383335c36ffdf3ee074c8ca698e7b48035
 +213420
 +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