[Python-modules-commits] [cookiecutter] 06/08: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Sun Dec 25 20:18:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
bernat pushed a commit to branch master
in repository cookiecutter.
commit 50adfa38ba26b24ba3c904d289a7be12a9cf5d7d
Merge: faba5d8 3105ab7
Author: Vincent Bernat <bernat at debian.org>
Date: Sun Dec 25 20:48:16 2016 +0100
merge patched into master
.github/ISSUE_TEMPLATE.md | 15 +
.gitmodules | 3 +
.travis.yml | 28 +-
AUTHORS.rst | 42 +
CONTRIBUTING.rst | 914 +++++++++++----------
HISTORY.rst | 251 +++++-
Makefile | 17 +-
README.rst | 478 +++++++----
__main__.py | 7 +
appveyor.yml | 7 +
case_studies.rst | 42 +
cookiecutter/__init__.py | 3 +-
cookiecutter/__main__.py | 9 +
cookiecutter/cli.py | 80 +-
cookiecutter/config.py | 35 +-
cookiecutter/environment.py | 31 +-
cookiecutter/exceptions.py | 5 +-
cookiecutter/extensions.py | 19 +
cookiecutter/find.py | 20 +-
cookiecutter/generate.py | 113 ++-
cookiecutter/hooks.py | 110 ++-
cookiecutter/log.py | 47 ++
cookiecutter/main.py | 91 +-
cookiecutter/prompt.py | 103 ++-
cookiecutter/repository.py | 103 +++
cookiecutter/utils.py | 6 +-
cookiecutter/vcs.py | 80 +-
debian/.git-dpm | 6 +-
debian/patches/0001-Don-t-test-for-.DS_Store.patch | 6 +-
.../patches/0002-Use-PyYAML-instead-of-poyo.patch | 14 +-
...ild-reproducible-by-avoiding-nondetermini.patch | 81 --
...privacy-breach-images-from-documentation.patch} | 33 +-
debian/patches/series | 3 +-
docs/advanced/calling_from_python.rst | 18 +
docs/advanced/choice_variables.rst | 81 ++
docs/advanced/cli_options.rst | 6 +
docs/advanced/copy_without_render.rst | 17 +
docs/advanced/dict_variables.rst | 65 ++
docs/advanced/hooks.rst | 61 ++
docs/advanced/index.rst | 22 +
docs/advanced/injecting_content.rst | 30 +
docs/advanced/replay.rst | 42 +
docs/advanced/suppressing_prompts.rst | 33 +
docs/advanced/template_extensions.rst | 32 +
docs/advanced/templates_in_context.rst | 37 +
docs/advanced/user_config.rst | 53 ++
docs/advanced_usage.rst | 406 ---------
docs/case_studies.rst | 1 +
docs/conf.py | 6 +-
docs/cookiecutter.rst | 8 +
docs/first_steps.rst | 1 +
docs/index.rst | 9 +-
docs/installation.rst | 36 +-
docs/overview.rst | 14 +-
docs/sprint-contributors.rst | 66 ++
docs/troubleshooting.rst | 2 +-
docs/tutorial1.rst | 25 +-
docs/tutorial2.rst | 6 +-
docs/tutorials.rst | 10 +-
docs/usage.rst | 5 +-
setup.cfg | 2 +-
setup.py | 16 +-
tests/conftest.py | 57 +-
tests/fake-repo-dict/cookiecutter.json | 20 +
.../{{cookiecutter.project_slug}}/README.md | 20 +
.../{{cookiecutter.repo_name}}/README.rst | 2 +
tests/fake-repo/cookiecutter.json | 0
tests/files/{{cookiecutter.jsonify_file}}.txt | 1 +
tests/replay/conftest.py | 1 +
tests/repository/test_abbreviation_expansion.py | 54 ++
.../test_determine_repo_dir_clones_repo.py | 72 ++
...termine_repo_dir_finds_existing_cookiecutter.py | 36 +
...t_determine_repository_should_use_local_repo.py | 70 ++
.../test_is_repo_url.py} | 8 +-
.../test_repository_has_cookiecutter_json.py | 20 +
tests/skipif_markers.py | 35 -
.../custom-extension-post/cookiecutter.json | 5 +
.../hooks/post_gen_project.py | 4 +
.../{{cookiecutter.project_slug}}/README.rst | 1 +
.../custom-extension-pre/cookiecutter.json | 5 +
.../custom-extension-pre/hooks/pre_gen_project.py | 4 +
.../{{cookiecutter.project_slug}}/README.rst | 1 +
tests/test-extensions/hello_extension/__init__.py | 1 +
.../hello_extension/hello_extension.py | 20 +
tests/test-pyhooks/hooks/post_gen_project.py | 0
tests/test-pyhooks/hooks/pre_gen_project.py | 0
tests/test-pyshellhooks/hooks/post_gen_project.py | 0
tests/test-pyshellhooks/hooks/pre_gen_project.py | 0
.../test-shellhooks-empty/hooks/pre_gen_project.sh | 0
.../input{{cookiecutter.shellhooks}}/README.rst | 1 +
tests/test_abbreviation_expansion.py | 68 --
tests/test_cli.py | 240 ++++--
tests/test_cookiecutter_local_no_input.py | 50 +-
tests/test_cookiecutter_local_with_input.py | 1 -
tests/test_cookiecutter_repo_arg.py | 71 --
tests/test_cookiecutters.py | 73 --
tests/test_custom_extensions_in_hooks.py | 51 ++
tests/test_find.py | 1 -
tests/test_generate_context.py | 1 -
tests/test_generate_copy_without_render.py | 1 -
tests/test_generate_file.py | 20 +-
tests/test_generate_files.py | 1 -
tests/test_generate_hooks.py | 43 +-
tests/test_get_config.py | 21 +-
tests/test_get_user_config.py | 47 +-
tests/test_hooks.py | 75 +-
tests/test_identify_repo.py | 39 -
tests/test_is_vcs_installed.py | 17 -
tests/test_log.py | 133 +++
tests/test_main.py | 106 +--
tests/test_more_cookiecutters.py | 72 --
tests/test_output_folder.py | 1 -
tests/test_prompt.py | 172 +++-
tests/test_read_user_dict.py | 129 +++
tests/test_read_user_variable.py | 0
tests/test_specify_output_dir.py | 4 +-
tests/test_utils.py | 1 -
tests/test_vcs.py | 145 ----
tests/test_vcs_prompt.py | 88 --
tests/vcs/test_clone.py | 219 +++++
tests/vcs/test_identify_repo.py | 59 ++
tests/vcs/test_is_vcs_installed.py | 19 +
tests/vcs/test_prompt_and_delete_repo.py | 56 ++
tox.ini | 6 +-
124 files changed, 4114 insertions(+), 2266 deletions(-)
diff --cc debian/.git-dpm
index ae6f9ea,0000000..4c2e672
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
- 33756fe4b6713bb4f492a80579ce5e520fe5e847
- 33756fe4b6713bb4f492a80579ce5e520fe5e847
- 2cff56151f5e99b0914d57e6202c4ce7abd84935
++3105ab76eb8f09bc974e42fc17ce859e453e2062
++3105ab76eb8f09bc974e42fc17ce859e453e2062
++119be0b58de22342b1850173629a4db9cfc7d1d6
+119be0b58de22342b1850173629a4db9cfc7d1d6
+cookiecutter_1.5.0.orig.tar.gz
+be2134effee7314c5a305b5cc984feac9c3f7182
+246654
+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 d6d6427,0000000..678d737
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 d189085cd62e6d083391e026349b2f6da56f3a5f Mon Sep 17 00:00:00 2001
++From 102437a5cc04d234eb7c62aa050088f2ec14ea7f 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 0d624532a9cd..84fe8a9c9d37 100644
++index f71192f1a6d4..b425fc6d8000 100644
+--- a/tests/test_generate_files.py
++++ b/tests/test_generate_files.py
- @@ -113,11 +113,9 @@ def test_generate_files_binaries():
++@@ -112,11 +112,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(
diff --cc debian/patches/0002-Use-PyYAML-instead-of-poyo.patch
index 0c20dcb,0000000..669bbe3
mode 100644,000000..100644
--- a/debian/patches/0002-Use-PyYAML-instead-of-poyo.patch
+++ b/debian/patches/0002-Use-PyYAML-instead-of-poyo.patch
@@@ -1,49 -1,0 +1,49 @@@
- From cfc9baee3a75ee9a55d074305970be0e222837a2 Mon Sep 17 00:00:00 2001
++From 10b3508bd3aad4a5dc3e37f3b7bcd143ddad9c43 Mon Sep 17 00:00:00 2001
+From: Vincent Bernat <vincent at bernat.im>
+Date: Sat, 28 May 2016 15:06:44 +0200
+Subject: Use PyYAML instead of poyo
+
+There is no problem with PyYAML in Debian and therefore, we don't need
+to switch to poyo (a pure YAMLish parser).
+---
+ cookiecutter/config.py | 6 +++---
+ setup.py | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/cookiecutter/config.py b/cookiecutter/config.py
- index fb69b47e58b0..af9e83c33f99 100755
++index 060e6ca98a82..cd3bd23481e9 100644
+--- a/cookiecutter/config.py
++++ b/cookiecutter/config.py
- @@ -14,7 +14,7 @@ import logging
++@@ -13,7 +13,7 @@ import logging
+ import os
+ import io
+
+-import poyo
++import yaml
+
+ from .exceptions import ConfigDoesNotExistException
+ from .exceptions import InvalidConfiguration
- @@ -49,8 +49,8 @@ def get_config(config_path):
++@@ -54,8 +54,8 @@ def get_config(config_path):
+ logger.debug('config_path is {0}'.format(config_path))
+ with io.open(config_path, encoding='utf-8') as file_handle:
+ try:
+- yaml_dict = poyo.parse_string(file_handle.read())
+- except poyo.exceptions.PoyoException as e:
++ yaml_dict = yaml.safe_load(file_handle.read())
++ except yaml.error.YAMLError as e:
+ raise InvalidConfiguration(
+ 'Unable to parse YAML file {}. Error: {}'
+ ''.format(config_path, e)
+diff --git a/setup.py b/setup.py
- index 5baa19421705..01f1ca238a18 100755
++index 5a45b5c3df0f..2805cd0a858e 100644
+--- a/setup.py
++++ b/setup.py
- @@ -30,7 +30,7 @@ requirements = [
++@@ -28,7 +28,7 @@ requirements = [
+ 'jinja2>=2.7',
+ 'click>=5.0',
- 'whichcraft>=0.1.1',
++ 'whichcraft>=0.4.0',
+- 'poyo>=0.1.0',
++ 'PyYAML',
+ 'jinja2-time>=0.1.0'
+ ]
+
diff --cc debian/patches/0003-Remove-all-privacy-breach-images-from-documentation.patch
index ae97775,0000000..883ed33
mode 100644,000000..100644
--- a/debian/patches/0003-Remove-all-privacy-breach-images-from-documentation.patch
+++ b/debian/patches/0003-Remove-all-privacy-breach-images-from-documentation.patch
@@@ -1,85 -1,0 +1,66 @@@
- From 33756fe4b6713bb4f492a80579ce5e520fe5e847 Mon Sep 17 00:00:00 2001
++From 3105ab76eb8f09bc974e42fc17ce859e453e2062 Mon Sep 17 00:00:00 2001
+From: Vincent Bernat <vincent at bernat.im>
+Date: Tue, 25 Oct 2016 09:00:50 +0200
+Subject: Remove all privacy-breach images from documentation
+
+---
- README.rst | 40 +++-------------------------------------
++ README.rst | 29 +----------------------------
+ docs/cookiecutter_medium.png | 1 +
- 2 files changed, 4 insertions(+), 37 deletions(-)
++ 2 files changed, 2 insertions(+), 28 deletions(-)
+ create mode 120000 docs/cookiecutter_medium.png
+
+diff --git a/README.rst b/README.rst
- index 82ea8ab11586..4a8437676d3b 100644
++index 23b67be52f0c..15afbb9bff52 100644
+--- a/README.rst
++++ b/README.rst
- @@ -2,36 +2,6 @@
++@@ -2,33 +2,6 @@
+ Cookiecutter
+ =============
+
+-.. image:: https://img.shields.io/pypi/v/cookiecutter.svg
+- :target: https://pypi.python.org/pypi/cookiecutter
+-
+-.. image:: https://travis-ci.org/audreyr/cookiecutter.png?branch=master
+- :target: https://travis-ci.org/audreyr/cookiecutter
+-
+-.. image:: https://ci.appveyor.com/api/projects/status/github/audreyr/cookiecutter?branch=master
+- :target: https://ci.appveyor.com/project/audreyr/cookiecutter/branch/master
+-
- -.. image:: https://img.shields.io/pypi/dm/cookiecutter.svg
- - :target: https://pypi.python.org/pypi/cookiecutter
- -
+-.. image:: https://codecov.io/github/audreyr/cookiecutter/coverage.svg?branch=master
+- :target: https://codecov.io/github/audreyr/cookiecutter?branch=master
+-
+-.. image:: https://badges.gitter.im/Join Chat.svg
+- :target: https://gitter.im/audreyr/cookiecutter?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+-
+-.. image:: https://readthedocs.org/projects/cookiecutter/badge/?version=latest
+- :target: https://readthedocs.org/projects/cookiecutter/?badge=latest
+- :alt: Documentation Status
+-
+-.. image:: https://landscape.io/github/audreyr/cookiecutter/master/landscape.svg?style=flat
+- :target: https://landscape.io/github/audreyr/cookiecutter/master
+- :alt: Code Health
+-
+-.. image:: https://img.shields.io/scrutinizer/g/audreyr/cookiecutter.svg
+- :target: https://scrutinizer-ci.com/g/audreyr/cookiecutter/?branch=master
+- :alt: Scrutinizer Code Quality
+-
+ A command-line utility that creates projects from **cookiecutters** (project
+ templates), e.g. creating a Python package project from a Python package project template.
+
- @@ -40,7 +10,7 @@ templates), e.g. creating a Python package project from a Python package project
++@@ -37,7 +10,7 @@ templates), e.g. creating a Python package project from a Python package project
+ * Free software: BSD license
+ * PyPI: https://pypi.python.org/pypi/cookiecutter
+
+-.. image:: https://raw.github.com/audreyr/cookiecutter/aa309b73bdc974788ba265d843a65bb94c2e608e/cookiecutter_medium.png
++.. image:: cookiecutter_medium.png
+
- Features
- --------
- @@ -446,13 +416,9 @@ Waiting for a response to an issue/question?
- Support This Project
- --------------------
-
- -This project is maintained by volunteers. Support their efforts by spreading the word about:
- +This project is maintained by volunteers. Support their efforts by spreading the word about `Two Scoops Academy`_.
-
- -.. image:: https://s3.amazonaws.com/tsacademy/images/tsa-logo-250x60-transparent-01.png
- - :name: Two Scoops Academy
- - :align: center
- - :alt: Two Scoops Academy
- - :target: http://www.twoscoops.academy/
- +.. _`Two Scoops Academy`: http://www.twoscoops.academy/
++ We are proud to be an open source sponsor of `PyCon 2016`_.
+
- Code of Conduct
- ---------------
+diff --git a/docs/cookiecutter_medium.png b/docs/cookiecutter_medium.png
+new file mode 120000
+index 000000000000..a643810a7e7f
+--- /dev/null
++++ b/docs/cookiecutter_medium.png
+@@ -0,0 +1 @@
++../cookiecutter_medium.png
+\ No newline at end of file
diff --cc debian/patches/series
index 02fbb94,0000000..de5f0e7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,3 @@@
+0001-Don-t-test-for-.DS_Store.patch
+0002-Use-PyYAML-instead-of-poyo.patch
- 0003-Make-the-build-reproducible-by-avoiding-nondetermini.patch
- 0004-Remove-all-privacy-breach-images-from-documentation.patch
++0003-Remove-all-privacy-breach-images-from-documentation.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cookiecutter.git
More information about the Python-modules-commits
mailing list