Merge branch 'master' into posix-symlink

.travis.yml

@@ -6,21 +6,21 @@ language: python
 matrix:
     include:
       - python: 2.7
-        env: TOX_ENV=py27
+        env: TOXENV=py27
       - python: 3.3
-        env: TOX_ENV=py33
+        env: TOXENV=py33
       - python: 3.4
-        env: TOX_ENV=py34
+        env: TOXENV=py34
       - python: 3.5
-        env: TOX_ENV=py35
+        env: TOXENV=py35
       - python: 3.6
-        env: TOX_ENV=py36
+        env: TOXENV=py36
       - python: pypy
-        env: TOX_ENV=pypy
+        env: TOXENV=pypy
       - python: 3.5
-        env: TOX_ENV=flake8
+        env: TOXENV=flake8
 
-script: tox -e $TOX_ENV
+script: tox
 
 install:
     - pip install tox
@@ -30,4 +30,4 @@ after_success:
     # Report coverage results to codecov.io
     # and export tox environment variables
     - pip install codecov
-    - codecov -e TOX_ENV TRAVIS_OS_NAME
+    - codecov -e TOXENV TRAVIS_OS_NAME

AUTHORS.rst

@@ -113,6 +113,17 @@ Contributors
 * mathagician (`@mathagician`_)
 * Guillaume Gelin (`@ramnes`_)
 * @delirious-lettuce (`@delirious-lettuce`_)
+* Gasper Vozel (`@karantan`_)
+* Joshua Carp (`@jmcarp`_)
+* @meahow (`@meahow`_)
+* Andrea Grandi (`@andreagrandi`_)
+* Issa Jubril (`@jubrilissa`_)
+* Nytiennzo Madooray (`@Nythiennzo`_)
+* Erik Bachorski (`@dornheimer`_)
+* cclauss (`@cclauss`_)
+* Andy Craze (`@accraze`_)
+* Anthony Sottile (`@asottile`_)
+* Jonathan Sick (`@jonathansick`_)
 
 .. _`@cedk`: https://github.com/cedk
 .. _`@johtso`: https://github.com/johtso
@@ -214,3 +225,15 @@ Contributors
 .. _`@mathagician`: https://github.com/mathagician
 .. _`@ramnes`: https://github.com/ramnes
 .. _`@delirious-lettuce`: https://github.com/delirious-lettuce
+.. _`@karantan`: https://github.com/karantan
+.. _`@jmcarp`: https://github.com/jmcarp
+.. _`@meahow`: https://github.com/meahow
+.. _`@andreagrandi`: https://github.com/andreagrandi
+.. _`@jubrilissa`: https://github.com/jubrilissa
+.. _`@Nythiennzo`: https://github.com/Nythiennzo
+.. _`@dornheimer`: https://github.com/dornheimer
+.. _`@cclauss`: https://github.com/cclauss
+.. _`@accraze`: https://github.com/accraze
+.. _`@asottile`: https://github.com/asottile
+.. _`@jonathansick`: https://github.com/jonathansick
+

BACKERS.rst

@@ -5,5 +5,9 @@ Backers
 We would like to thank the following people for supporting us in our efforts to
 maintain and improve Cookiecutter:
 
+* Alex DeBrie
+* Alexandre Y. Harano
 * Bruno Alla
+* Carol Willing
 * Russell Keith-Magee
+

CODE_OF_CONDUCT.md

@@ -0,0 +1,7 @@
+# Code of Conduct
+
+Everyone interacting in the Cookiecutter project's codebases, issue trackers,
+chat rooms, and mailing lists is expected to follow the
+[PyPA Code of Conduct][coc].
+
+[coc]: https://www.pypa.io/en/latest/code-of-conduct/

HISTORY.rst

@@ -3,7 +3,63 @@
 History
 -------
 
-1.6.0 (????-??-??) ???????
+1.7.0 (????-??-??) ???????
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Other Changes:
+
+* Add a `CODE_OF_CONDUCT.md`_ file to the project, thanks to
+  `@andreagrandi`_ (#1009)
+* Update docstrings in ``cookiecutter/main.py``, ``cookiecutter/__init__.py``,
+  and ``cookiecutter/log.py`` to follow the PEP 257 style guide, thanks to
+  `@meahow`_ (#998, #999, #1000)
+* Update docstrings in ``cookiecutter/utils.py`` to follow the PEP 257 style
+  guide, thanks to `@dornheimer`_ (#1026)
+* Fix grammar in *Choice Variables* documentation, thanks to `@jubrilissa`_
+  (#1011)
+* Update installation docs with links to the Windows Subsystem and GNU
+  utilities, thanks to `@Nythiennzo`_ for the PR and `@BruceEckel`_ for the
+  review (#1016)
+* Upgrade flake8 to version 3.5.0, thanks to `@cclauss`_ (#1038)
+* Update tutorial with explanation for how cookiecutter finds the template
+  file, thanks to `@accraze`_ (#1025)
+* Update CI config files to use ``TOXENV`` environment variable, thanks to
+  `@asottile`_ (#1019)
+* Improve user documentation for writing hooks, thanks to `@jonathansick`_
+  (#1057)
+* Add more cookiecutter templates to the mix:
+
+  * `cookiecutter-python-cli`_ by `@xuanluong`_ (#1003)
+  * `cookiecutter-docker-science`_ by `@takahi-i`_ (#1040)
+  * `cookiecutter-flask-skeleton`_ by `@mjhea0`_ (#1052)
+  * `cookiecutter-awesome`_ by `@Pawamoy`_ (#1051)
+  * `cookiecutter-flask-ask`_ by `@machinekoder`_ (#1056)
+  * `cookiecutter-data-driven-journalism`_ by `@JAStark`_ (#1020)
+
+.. _`cookiecutter-python-cli`: https://github.com/xuanluong/cookiecutter-python-cli
+.. _`cookiecutter-docker-science`: https://github.com/docker-science/cookiecutter-docker-science
+.. _`cookiecutter-flask-skeleton`: https://github.com/realpython/cookiecutter-flask-skeleton
+.. _`cookiecutter-awesome`: https://github.com/Pawamoy/cookiecutter-awesome
+.. _`cookiecutter-flask-ask`: https://github.com/chrisvoncsefalvay/cookiecutter-flask-ask
+.. _`cookiecutter-data-driven-journalism`: https://github.com/jastark/cookiecutter-data-driven-journalism
+.. _`CODE_OF_CONDUCT.md`: https://github.com/audreyr/cookiecutter/blob/master/CODE_OF_CONDUCT.md
+
+.. _`@xuanluong`: https://github.com/xuanluong
+.. _`@andreagrandi`: https://github.com/andreagrandi
+.. _`@jubrilissa`: https://github.com/jubrilissa
+.. _`@Nythiennzo`: https://github.com/Nythiennzo
+.. _`@takahi-i`: https://github.com/takahi-i
+.. _`@dornheimer`: https://github.com/dornheimer
+.. _`@Pawamoy`: https://github.com/Pawamoy
+.. _`@cclauss`: https://github.com/cclauss
+.. _`@accraze`: https://github.com/accraze
+.. _`@asottile`: https://github.com/asottile
+.. _`@jonathansick`: https://github.com/jonathansick
+.. _`@machinekoder`: https://github.com/machinekoder
+.. _`@JAStark`: https://github.com/JAStark
+
+
+1.6.0 (2017-10-15) Tim Tam
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New Features:
@@ -12,6 +68,8 @@ New Features:
   ``_template``, thanks to `@aroig`_ (#774)
 * Add a URL abbreviation for GitLab template projects, thanks to `@hackebrot`_
   (#963)
+* Add option to use templates from Zip files or Zip URLs, thanks to
+  `@freakboy3742`_ (#961)
 
 Bug Fixes:
 
@@ -20,6 +78,8 @@ Bug Fixes:
   and `@hackebrot`_ for the fix (#966, #967)
 * Preserve existing output directory on project generation failure, thanks to
   `@ionelmc`_ for the report and `@michaeljoseph`_ for the fix (#629, #964)
+* Fix Python 3.x error handling for ``git`` operation failures, thanks to `@jmcarp`_
+  (#905)
 
 Other Changes:
 
@@ -33,6 +93,8 @@ Other Changes:
   according to pep257, thanks to `@terryjbates`_ (#922, #931)
 * Update doc string for ``is_copy_only_path()`` according to pep257, thanks to
   `@mathagician`_ and `@terryjbates`_ (#935, #949)
+* Update doc strings in ``cookiecutter/extensions.py`` according to pep257,
+  thanks to `@meahow`_ (#996)
 * Fix miscellaneous issues with building docs, thanks to `@stevepiercy`_ (#889)
 * Re-implement Makefile and update several make rules, thanks to `@hackebrot`_
   (#930)
@@ -42,6 +104,9 @@ Other Changes:
   to `@ramnes`_ (#945)
 * Improve wording in *copy without render* docs, thanks to `@eyalev`_ (#938)
 * Fix a number of typos, thanks to `@delirious-lettuce`_ (#968)
+* Improved *extra context* docs by noting that extra context keys must be
+  present in the template's ``cookiecutter.json``, thanks to `@karantan`_ for
+  the report and fix (#863, #864)
 * Added more cookiecutter templates to the mix:
 
   * `cookiecutter-kata-cpputest`_ by `@13coders`_ (#901)
@@ -58,9 +123,16 @@ Other Changes:
   * `cookiecutter-conda-python`_ by `@conda`_ (#969)
   * `cookiecutter-flask-minimal`_ by `@candidtim`_ (#977)
   * `cookiecutter-pypackage-rust-cross-platform-publish`_ by `@mckaymatt`_ (#957)
-
-.. _cookiecutter-kata-gtest: https://github.com/13coders/cookiecutter-kata-gtest
-.. _cookiecutter-kata-cpputest: https://github.com/13coders/cookiecutter-kata-cpputest
+  * `cookie-cookie`_ by `@tuxredux`_ (#951)
+  * `cookiecutter-telegram-bot`_ by `@Ars2014`_ (#984)
+  * `python-project-template`_ by `@Kwpolska`_ (#986)
+  * `wemake-django-template`_ by `@wemake-services`_ (#990)
+  * `cookiecutter-raml`_ by `@genzj`_ (#994)
+  * `cookiecutter-anyblok-project`_ by `@AnyBlok`_ (#988)
+  * `cookiecutter-devenv`_ by `@greenguavalabs`_ (#991)
+
+.. _`cookiecutter-kata-gtest`: https://github.com/13coders/cookiecutter-kata-gtest
+.. _`cookiecutter-kata-cpputest`: https://github.com/13coders/cookiecutter-kata-cpputest
 .. _`cookiecutter-pyramid-talk-python-starter`: https://github.com/mikeckennedy/cookiecutter-pyramid-talk-python-starter
 .. _`cookiecutter-android`: https://github.com/alexfu/cookiecutter-android
 .. _`cookiecutter-lux-python`: https://github.com/alexkey/cookiecutter-lux-python
@@ -73,6 +145,13 @@ Other Changes:
 .. _`cookiecutter-conda-python`: https://github.com/conda/cookiecutter-conda-python
 .. _`cookiecutter-flask-minimal`: https://github.com/candidtim/cookiecutter-flask-minimal
 .. _`cookiecutter-pypackage-rust-cross-platform-publish`: https://github.com/mckaymatt/cookiecutter-pypackage-rust-cross-platform-publish
+.. _`cookie-cookie`: https://github.com/tuxredux/cookie-cookie
+.. _`cookiecutter-telegram-bot`: https://github.com/Ars2014/cookiecutter-telegram-bot
+.. _`python-project-template`: https://github.com/Kwpolska/python-project-template
+.. _`wemake-django-template`: https://github.com/wemake-services/wemake-django-template
+.. _`cookiecutter-raml`: https://github.com/genzj/cookiecutter-raml
+.. _`cookiecutter-anyblok-project`: https://github.com/AnyBlok/cookiecutter-anyblok-project
+.. _`cookiecutter-devenv`: https://bitbucket.org/greenguavalabs/cookiecutter-devenv.git
 
 .. _`@13coders`: https://github.com/13coders
 .. _`@coreysnyder04`: https://github.com/coreysnyder04
@@ -94,6 +173,15 @@ Other Changes:
 .. _`@conda`: https://github.com/conda
 .. _`@candidtim`: https://github.com/candidtim
 .. _`@mckaymatt`: https://github.com/mckaymatt
+.. _`@karantan`: https://github.com/karantan
+.. _`@jmcarp`: https://github.com/jmcarp
+.. _`@Ars2014`: https://github.com/Ars2014
+.. _`@Kwpolska`: https://github.com/Kwpolska
+.. _`@wemake-services`: https://github.com/wemake-services
+.. _`@genzj`: https://github.com/genzj
+.. _`@AnyBlok`: https://github.com/AnyBlok
+.. _`@greenguavalabs`: https://bitbucket.org/greenguavalabs
+.. _`@meahow`: https://github.com/meahow
 
 1.5.1 (2017-02-04) Alfajor
 ~~~~~~~~~~~~~~~~~~~~~~~~~~