Merge branch 'master' of github.com:pydanny/cookiecutter-django

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: pydanny
+github: [pydanny, browniebroke]
 patreon: roygreenfeld
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE.md

@@ -1 +0,0 @@
-## [Make sure to follow one of the issue templates we've got](https://github.com/pydanny/cookiecutter-django/issues/new/choose), otherwise the issue might be closed immeditely

.github/ISSUE_TEMPLATE/bug.md

@@ -1,21 +1,33 @@
 ---
 name: Bug Report
 about: Report a bug
+title: '[bug]'
+labels: bug
 ---
 
 ## What happened?
 
-
-
-
 ## What should've happened instead?
 
+## Additional details
 
+<!-- To assist you best, please include commands that you've run, options you've selected and any relevant logs -->
 
-
+* Host system configuration: 
-## Steps to reproduce
+    * Version of cookiecutter CLI (get it with `cookiecutter --version`):
-
+    * OS:
-[//]: # (Any or all of the following:)
+    * Python version:
-[//]: # (* Host system configuration: OS, Docker & friends' versions etc.)
+    * Docker versions (if using Docker):
-[//]: # (* Replay file https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html)
+    * ...
-[//]: # (* Logs)
+* Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html):
+    ``` 
+    ```
+<summary>
+Logs:
+<details>
+<pre>
+$ cookiecutter https://github.com/pydanny/cookiecutter-django
+project_name [Project Name]: ...
+</pre>
+</details>
+</summary>

.github/ISSUE_TEMPLATE/feature.md

@@ -1,24 +1,14 @@
 ---
 name: New Feature Proposal
 about: Propose a new feature
+title: '[feature request]'
+labels: enhancement
 ---
 
 ## Description
 
-[//]: # (What's it you're proposing? How should it be implemented?)
+What are you proposing? How should it be implemented?
-
-
-
 
 ## Rationale
 
-[//]: # (Why should this feature be implemented?)
+Why should this feature be implemented?
-
-
-
-
-## Use case(s) / visualization(s)
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-

.github/ISSUE_TEMPLATE/improvement.md

@@ -1,24 +0,0 @@
----
-name: Improvement Suggestion
-about: Let us know how we could improve
----
-
-## Description
-
-[//]: # (What's it you're proposing? How should it be implemented?)
-
-
-
-
-## Rationale
-
-[//]: # (Why should this feature be implemented?)
-
-
-
-
-## Use case(s) / visualization(s)
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-

.github/ISSUE_TEMPLATE/paid-support.md

@@ -1,10 +1,16 @@
 ---
 name: Paid Support Request
 about: Ask Core Team members to help you out
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
-Provided your question goes beyound [regular support](https://github.com/pydanny/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
+Provided your question goes beyond [regular support](https://github.com/pydanny/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
 
 * Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
 
 * Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
+
+* Bruno Alla, Core Developer ([GitHub](https://github.com/sponsors/browniebroke)).

.github/ISSUE_TEMPLATE/question.md

@@ -1,6 +1,12 @@
 ---
 name: Question
-about: Please, ask your question on StackOverflow or Gitter
+about: Please consider asking your question on StackOverflow or Slack
+title: '[question]'
+labels: question
 ---
 
-First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`. Finally, feel free to join [Gitter](https://gitter.im/pydanny/cookiecutter-django) and ask around.
+First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). 
+
+If that doesn't help, post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you might get more visibility there than on our issue tracker. 
+
+Finally, feel free to join [Slack](https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U) and ask around.

.github/ISSUE_TEMPLATE/regression.md

@@ -1,28 +0,0 @@
----
-name: Regression Report
-about: Let us know if something that'd been working has broke
----
-
-## What happened before?
-
-
-
-
-## What happens now?
-
-
-
-
-## Last stable commit / Since when?
-
-
-
-
-## Steps to reproduce
-
-[//]: # (Any or all of the following:)
-[//]: # (* Host system configuration: OS, Docker & friends' versions etc.)
-[//]: # (* Project generation options)
-[//]: # (* Logs)
-
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +1,18 @@
-[//]: # (Thank you for helping us out: your efforts mean great deal to the project and the community as a whole!)
+<!-- Thank you for helping us out: your efforts mean a great deal to the project and the community as a whole! -->
-
-[//]: # (Before you proceed:)
-
-[//]: # (- Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing)
-[//]: # (- If you're adding a new option, please make sure that tests/test_cookiecutter_generation.py is updated accordingly)
 
 
 ## Description
 
-[//]: # (What's it you're proposing?)
+<!-- What's it you're proposing? -->
 
+Checklist:
+
+- [ ] I've made sure that `tests/test_cookiecutter_generation.py` is updated accordingly (especially if adding or updating a template option)
+- [ ] I've updated the documentation or confirm that my change doesn't require any updates
 
 ## Rationale
 
-[//]: # (Why does the project need that?)
+<!-- 
-
+Why does this project need the change you're proposing? 
-
+If this pull request fixes an open issue, don't forget to link it with `Fix #NNNN` 
-## Use case(s) / visualization(s)
+-->
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Config for Dependabot updates. See Documentation here:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Update Github actions in workflows
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/pre-commit-autoupdate.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2.1.1
+    - uses: actions/setup-python@v2.1.2
       with:
         python-version: 3.8
 

.github/workflows/update-changelog.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v2.1.2
       with:
         python-version: "3.8"
     - name: Install dependencies

.github/workflows/update-contributors.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v2.1.2
       with:
         python-version: "3.8"
     - name: Install dependencies

.gitignore

@@ -208,16 +208,6 @@ Session.vim
 tags
 
 
-### VirtualEnv template
-# Virtualenv
-# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
-[Ii]nclude
-[Ll]ib
-[Ll]ib64
-pyvenv.cfg
-pip-selfcheck.json
-
-
 # Even though the project might be opened and edited
 # in any of the JetBrains IDEs, it makes no sence whatsoever
 # to 'run' anything within it since any particular cookiecutter

CHANGELOG.md

@@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-09-09]
+### Changed
+- Update actions/setup-python requirement to v2.1.2 ([#2804](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2804))
+- Clean up nested venv files from `.gitignore` ([#2800](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2800))
+
 ## [2020-09-08]
 ### Changed
 - Traeffik and Django dockerfile changes ([#2801](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2801))

cookiecutter.json

@@ -59,6 +59,5 @@
     "Gitlab"
   ],
   "keep_local_envs_in_vcs": "y",
-
   "debug": "n"
 }

requirements.txt

@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.5.1
+isort==5.5.2
 flake8==3.8.3
 flake8-isort==4.0.0
 

{{cookiecutter.project_slug}}/.gitignore

@@ -321,18 +321,6 @@ Session.vim
 
 # Auto-generated tag files
 tags
-{% if cookiecutter.use_docker == 'n' %}
-
-### VirtualEnv template
-# Virtualenv
-[Ii]nclude
-[Ll]ib
-[Ll]ib64
-[Ss]cripts
-pyvenv.cfg
-pip-selfcheck.json
-.env
-{% endif %}
 
 ### Project template
 {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}

{{cookiecutter.project_slug}}/.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
       - id: black
 
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.5.1
+    rev: 5.5.2
     hooks:
       - id: isort
 

{{cookiecutter.project_slug}}/requirements/production.txt

@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.4  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.1.0  # https://github.com/redis/hiredis-py