From 3152bdaeb37c863a4e7942d8a243af1d7453c9ce Mon Sep 17 00:00:00 2001 From: Hannah Lazarus Date: Fri, 24 Apr 2020 10:23:41 -0400 Subject: [PATCH 001/389] Add sphinx defaults for cookiecutter'd project -serve, watch + live reload for docs + code file changes -update project makefile + make.bat -separate _source and _build -add packages and paths to use autodoc -edit/add documentation with examples (both at django-cookiecutter and inside generated project) -add formatted comments in User model for pickup by Sphinx apidoc -serve docs from a separate docs container for docker build --- CONTRIBUTORS.rst | 1 + docs/document.rst | 36 ++++---------- .../compose/local/docs/Dockerfile | 30 +++++++++++ {{cookiecutter.project_slug}}/docs/Makefile | 34 ++++++++++--- .../docs/_source/howto.rst | 47 ++++++++++++++++++ .../docs/{ => _source}/index.rst | 2 + .../{ => _source}/pycharm/configuration.rst | 0 .../docs/{ => _source}/pycharm/images/1.png | Bin .../docs/{ => _source}/pycharm/images/2.png | Bin .../docs/{ => _source}/pycharm/images/3.png | Bin .../docs/{ => _source}/pycharm/images/4.png | Bin .../docs/{ => _source}/pycharm/images/7.png | Bin .../docs/{ => _source}/pycharm/images/8.png | Bin .../docs/{ => _source}/pycharm/images/f1.png | Bin .../docs/{ => _source}/pycharm/images/f2.png | Bin .../docs/{ => _source}/pycharm/images/f3.png | Bin .../docs/{ => _source}/pycharm/images/f4.png | Bin .../{ => _source}/pycharm/images/issue1.png | Bin .../{ => _source}/pycharm/images/issue2.png | Bin .../docs/_source/users.rst | 15 ++++++ {{cookiecutter.project_slug}}/docs/conf.py | 26 ++++++---- {{cookiecutter.project_slug}}/docs/make.bat | 19 +++++-- {{cookiecutter.project_slug}}/local.yml | 16 ++++++ .../requirements/local.txt | 6 ++- .../users/models.py | 11 +++- 25 files changed, 193 insertions(+), 50 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile create mode 100644 {{cookiecutter.project_slug}}/docs/_source/howto.rst rename {{cookiecutter.project_slug}}/docs/{ => _source}/index.rst (96%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/configuration.rst (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/1.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/2.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/3.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/4.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/7.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/8.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/f1.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/f2.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/f3.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/f4.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/issue1.png (100%) rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/issue2.png (100%) create mode 100644 {{cookiecutter.project_slug}}/docs/_source/users.rst diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 86b529eb..660ffc68 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -128,6 +128,7 @@ Listed in alphabetical order. Guilherme Guy `@guilherme1guy`_ Hamish Durkin `@durkode`_ Hana Quadara `@hanaquadara`_ + Hannah Lazarus `@hanhanhan`_ Harry Moreno `@morenoh149`_ @morenoh149 Harry Percival `@hjwp`_ Hendrik Schneider `@hendrikschneider`_ diff --git a/docs/document.rst b/docs/document.rst index 7207e357..990bbe8a 100644 --- a/docs/document.rst +++ b/docs/document.rst @@ -4,42 +4,26 @@ Document ========= This project uses Sphinx_ documentation generator. -After you have set up to `develop locally`_, run the following commands to generate the HTML documentation: :: - $ sphinx-build docs/ docs/_build/html/ +After you have set up to `develop locally`_, run the following command from the project directory to build and serve HTML documentation: :: + + $ make -C docs livehtml If you set up your project to `develop locally with docker`_, run the following command: :: - $ docker-compose -f local.yml run --rm django sphinx-build docs/ docs/_build/html/ + $ docker-compose -f local.yml up docs + +Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. Generate API documentation ---------------------------- -Sphinx can automatically generate documentation from docstrings, to enable this feature, follow these steps: +Edit the docs/_source files and project application docstrings to create your documentation. -1. Add Sphinx extension in ``docs/conf.py`` file, like below: :: - - extensions = [ - 'sphinx.ext.autodoc', - ] - -2. Uncomment the following lines in the ``docs/conf.py`` file: :: - - # import django - # sys.path.insert(0, os.path.abspath('..')) - # os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") - # django.setup() - -3. Run the following command: :: - - $ sphinx-apidoc -f -o ./docs/modules/ ./tpub/ migrations/* - - If you set up your project to `develop locally with docker`_, run the following command: :: - - $ docker-compose -f local.yml run --rm django sphinx-apidoc -f -o ./docs/modules ./tpub/ migrations/* - -4. Regenerate HTML documentation as written above. +Sphinx can automatically include class and function signatures and docstrings in generated documentation. +See the generated project documentation for more examples. +.. _localhost: http://localhost:7000/ .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html .. _develop locally: ./developing-locally.html .. _develop locally with docker: ./developing-locally-docker.html diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile new file mode 100644 index 00000000..7e79b0fa --- /dev/null +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -0,0 +1,30 @@ +FROM python:3.8-slim-buster + +ENV PYTHONUNBUFFERED 1 +ENV PYTHONDONTWRITEBYTECODE 1 + +RUN apt-get update \ + # dependencies for building Python packages + && apt-get install -y build-essential \ + # psycopg2 dependencies + && apt-get install -y libpq-dev \ + # Translations dependencies + && apt-get install -y gettext \ + # Enable Sphinx output to latex and pdf + && apt-get install -y texlive-latex-recommended \ + && apt-get install -y texlive-fonts-recommended \ + && apt-get install -y texlive-latex-extra \ + && apt-get install -y latexmk \ + # cleaning up unused files + && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && rm -rf /var/lib/apt/lists/* + +# Requirements are installed here to ensure they will be cached. +COPY ./requirements /requirements +# All imports needed for autodoc. +RUN pip install -r /requirements/local.txt +RUN pip install -r /requirements/production.txt + +WORKDIR /docs + +CMD make livehtml diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile index d4bb2cbb..90f61de3 100644 --- a/{{cookiecutter.project_slug}}/docs/Makefile +++ b/{{cookiecutter.project_slug}}/docs/Makefile @@ -3,18 +3,38 @@ # You can set these variables from the command line, and also # from the environment for the first two. -SPHINXOPTS ?= -SPHINXBUILD ?= sphinx-build -SOURCEDIR = . -BUILDDIR = _build +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build -c . +SOURCEDIR = ./_source +BUILDDIR = ./_build +{%- if cookiecutter.use_docker == 'y' %} +APP = /app +{%- else %} +APP = ../{{cookiecutter.project_slug}} +{% endif %} + +.PHONY: help livehtml apidocs Makefile # Put it first so that "make" without argument is like "make help". help: - @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + @$(SPHINXBUILD) help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -.PHONY: help Makefile +# Build, watch and serve docs with live reload +livehtml: + sphinx-autobuild -b html + {%- if cookiecutter.use_docker == 'y' %} -H 0.0.0.0 + {%- else %} --open-browser + {%- endif %} -p 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html + +# Outputs rst files from django application code +apidocs: + {%- if cookiecutter.use_docker == 'y' %} + sphinx-apidoc -o $(SOURCEDIR)/api /app + {%- else %} + sphinx-apidoc -o $(SOURCEDIR)/api ../{{cookiecutter.project_slug}} + {%- endif %} # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: Makefile - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + @$(SPHINXBUILD) -b $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/{{cookiecutter.project_slug}}/docs/_source/howto.rst b/{{cookiecutter.project_slug}}/docs/_source/howto.rst new file mode 100644 index 00000000..30927742 --- /dev/null +++ b/{{cookiecutter.project_slug}}/docs/_source/howto.rst @@ -0,0 +1,47 @@ +How To - Project Documentation +====================================================================== + +Get Started +---------------------------------------------------------------------- + +Documentation can be written as rst files in the `{{cookiecutter.project_slug}}/docs/_source`. + +{% if cookiecutter.use_docker == 'n' %} +To build and serve docs, use the command: + :: + + make livehtml + +from inside the `{{cookiecutter.project_slug}}/docs` directory. +{% else %} +To build and serve docs, use the commands: + :: + + docker-compose -f local.yml build + docker run docs +{% endif %} + +Changes to files in `docs/_source` will be picked up and reloaded automatically. + +`Sphinx `_ is the tool used to build documentation. + +Docstrings to Documentation +---------------------------------------------------------------------- + +The sphinx extension `apidoc `_ is used to automatically document code using signatures and docstrings. + +Numpy or Google style docstrings will be picked up from project files and availble for documentation. See the `Napoleon `_ extension for details. + +For an in-use example, see the `page source <_sources/users.rst.txt>`_ for :ref:`users`. + +To compile all docstrings automatically into documentation source files, use the command: + :: + + make apidocs + +{% if cookiecutter.use_docker == 'y' %} +This can be done in the docker container: + :: + + docker run --rm docs make apidocs +{% endif -%} diff --git a/{{cookiecutter.project_slug}}/docs/index.rst b/{{cookiecutter.project_slug}}/docs/_source/index.rst similarity index 96% rename from {{cookiecutter.project_slug}}/docs/index.rst rename to {{cookiecutter.project_slug}}/docs/_source/index.rst index b107a9e5..5fafc696 100644 --- a/{{cookiecutter.project_slug}}/docs/index.rst +++ b/{{cookiecutter.project_slug}}/docs/_source/index.rst @@ -10,7 +10,9 @@ Welcome to {{ cookiecutter.project_name }}'s documentation! :maxdepth: 2 :caption: Contents: + howto pycharm/configuration + users diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/configuration.rst rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/1.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/1.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/2.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/2.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/3.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/3.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/4.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/4.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/7.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/7.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/8.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/8.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/f1.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/f1.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/f2.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/f2.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/f3.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/f3.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/f4.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/f4.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/users.rst b/{{cookiecutter.project_slug}}/docs/_source/users.rst new file mode 100644 index 00000000..6cf64556 --- /dev/null +++ b/{{cookiecutter.project_slug}}/docs/_source/users.rst @@ -0,0 +1,15 @@ + .. _users: + +Users +====================================================================== + +Starting a new project, it’s highly recommended to set up a custom user model, +even if the default User model is sufficient for you. + +This model behaves identically to the default user model, +but you’ll be able to customize it in the future if the need arises. + +.. automodule:: {{cookiecutter.project_slug}}.users.models + :members: + :noindex: + diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py index bfde1e3a..691f351e 100644 --- a/{{cookiecutter.project_slug}}/docs/conf.py +++ b/{{cookiecutter.project_slug}}/docs/conf.py @@ -9,15 +9,19 @@ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -# + import os import sys +import django -# import django -# sys.path.insert(0, os.path.abspath('..')) -# os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") -# django.setup() - +{% if cookiecutter.use_docker == 'y' %} +sys.path.insert(0, os.path.abspath("/app")) +os.environ.setdefault("DATABASE_URL", "") +{% else %} +sys.path.insert(0, os.path.abspath("..")) +{%- endif %} +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") +django.setup() # -- Project information ----------------------------------------------------- @@ -31,17 +35,19 @@ author = "{{ cookiecutter.author_name }}" # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions = [] +extensions = [ + "sphinx.ext.autodoc", + "sphinx.ext.napoleon", +] # Add any paths that contain templates here, relative to this directory. -templates_path = ["_templates"] +# templates_path = ["_templates"] # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] - # -- Options for HTML output ------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for @@ -52,4 +58,4 @@ html_theme = "alabaster" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ["_static"] +# html_static_path = ["_static"] diff --git a/{{cookiecutter.project_slug}}/docs/make.bat b/{{cookiecutter.project_slug}}/docs/make.bat index 922152e9..b19f42c6 100644 --- a/{{cookiecutter.project_slug}}/docs/make.bat +++ b/{{cookiecutter.project_slug}}/docs/make.bat @@ -4,11 +4,13 @@ pushd %~dp0 REM Command file for Sphinx documentation + if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build + set SPHINXBUILD=sphinx-build -c . ) -set SOURCEDIR=. +set SOURCEDIR=_source set BUILDDIR=_build +set APP=..\{{cookiecutter.project_slug}} if "%1" == "" goto help @@ -20,16 +22,25 @@ if errorlevel 9009 ( echo.to the full path of the 'sphinx-build' executable. Alternatively you echo.may add the Sphinx directory to PATH. echo. + echo.Install sphinx-autobuild for live serving. echo.If you don't have Sphinx installed, grab it from echo.http://sphinx-doc.org/ exit /b 1 ) -%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +%SPHINXBUILD% -b %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% goto end +:livehtml +sphinx-autobuild -b html --open-browser -p 7000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html +GOTO :EOF + +:apidocs +sphinx-apidoc -o %SOURCEDIR%/api %APP% +GOTO :EOF + :help -%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +%SPHINXBUILD% -b help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% :end popd diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 60f8f922..0d9057b0 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -34,6 +34,22 @@ services: - local_postgres_data_backups:/backups env_file: - ./.envs/.local/.postgres + + docs: + image: {{ cookiecutter.project_slug }}_local_docs + container_name: docs + build: + context: . + dockerfile: ./compose/local/docs/Dockerfile + env_file: + - ./.envs/.local/.django + volumes: + - ./docs:/docs + - ./config:/app/config + - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }} + ports: + - "7000:7000" + {%- if cookiecutter.use_mailhog == 'y' %} mailhog: diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index f6be44b5..253cf738 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -2,7 +2,6 @@ Werkzeug==1.0.1 # https://github.com/pallets/werkzeug ipdb==0.13.2 # https://github.com/gotcha/ipdb -Sphinx==3.0.2 # https://github.com/sphinx-doc/sphinx {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 {%- else %} @@ -16,6 +15,11 @@ django-stubs==1.5.0 # https://github.com/typeddjango/django-stubs pytest==5.3.5 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.2 # https://github.com/Frozenball/pytest-sugar +# Documentation +# ------------------------------------------------------------------------------ +sphinx==3.0.2 # https://github.com/sphinx-doc/sphinx +sphinx-autobuild # https://github.com/GaretJax/sphinx-autobuild + # Code quality # ------------------------------------------------------------------------------ flake8==3.7.9 # https://github.com/PyCQA/flake8 diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py index 8f07b15a..adff2d66 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py @@ -5,10 +5,17 @@ from django.utils.translation import ugettext_lazy as _ class User(AbstractUser): + """Default user for {{cookiecutter.project_name}}. + """ - # First Name and Last Name do not cover name patterns - # around the globe. + #: First and last name do not cover name patterns around the globe name = CharField(_("Name of User"), blank=True, max_length=255) def get_absolute_url(self): + """Get url for user's detail view. + + Returns: + str: URL for user detail. + + """ return reverse("users:detail", kwargs={"username": self.username}) From 401ef31c6ce1519bc5deccb22143cfea0147ba9f Mon Sep 17 00:00:00 2001 From: Hannah Lazarus Date: Mon, 18 May 2020 10:33:57 -0400 Subject: [PATCH 002/389] Remove latex from sphinx docker build Include as helper comment only --- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 7e79b0fa..23af2e7b 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -10,8 +10,8 @@ RUN apt-get update \ && apt-get install -y libpq-dev \ # Translations dependencies && apt-get install -y gettext \ - # Enable Sphinx output to latex and pdf - && apt-get install -y texlive-latex-recommended \ + # Uncomment below to enable Sphinx output to latex and pdf + # && apt-get install -y texlive-latex-recommended \ && apt-get install -y texlive-fonts-recommended \ && apt-get install -y texlive-latex-extra \ && apt-get install -y latexmk \ From 8c2f49ad3850fd19e43333ca24a11e4efd989fe0 Mon Sep 17 00:00:00 2001 From: Hannah Lazarus Date: Sat, 27 Jun 2020 13:57:50 -0400 Subject: [PATCH 003/389] Update {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile sounds good! Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 23af2e7b..d84f76ed 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -22,8 +22,7 @@ RUN apt-get update \ # Requirements are installed here to ensure they will be cached. COPY ./requirements /requirements # All imports needed for autodoc. -RUN pip install -r /requirements/local.txt -RUN pip install -r /requirements/production.txt +pip install -r /requirements/local.txt -r /requirements/production.txt WORKDIR /docs From 916157e5006cbc2c7d0218c879429d06ac4eca66 Mon Sep 17 00:00:00 2001 From: Hannah Lazarus Date: Sat, 27 Jun 2020 14:11:57 -0400 Subject: [PATCH 004/389] Update {{cookiecutter.project_slug}}/docs/_source/howto.rst Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/docs/_source/howto.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/docs/_source/howto.rst b/{{cookiecutter.project_slug}}/docs/_source/howto.rst index 30927742..25f442c3 100644 --- a/{{cookiecutter.project_slug}}/docs/_source/howto.rst +++ b/{{cookiecutter.project_slug}}/docs/_source/howto.rst @@ -17,8 +17,7 @@ from inside the `{{cookiecutter.project_slug}}/docs` directory. To build and serve docs, use the commands: :: - docker-compose -f local.yml build - docker run docs + docker-compose -f local.yml up docs {% endif %} Changes to files in `docs/_source` will be picked up and reloaded automatically. From e1cd81e28c951effd3e23fd98d791f67464c77ee Mon Sep 17 00:00:00 2001 From: Richard Hajdu Date: Sun, 28 Jun 2020 18:38:29 +0200 Subject: [PATCH 005/389] Gulp watcher fix for win10 fixes #2642 Fix for browsersync and file watchers not working correctly on windows. --- {{cookiecutter.project_slug}}/gulpfile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js index 1f9884ec..206f8a01 100644 --- a/{{cookiecutter.project_slug}}/gulpfile.js +++ b/{{cookiecutter.project_slug}}/gulpfile.js @@ -163,9 +163,9 @@ function initBrowserSync() { // Watch function watchPaths() { - watch(`${paths.sass}/*.scss`, styles) - watch(`${paths.templates}/**/*.html`).on("change", reload) - watch([`${paths.js}/*.js`, `!${paths.js}/*.min.js`], scripts).on("change", reload) + watch(`${paths.sass}/*.scss`{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}, styles) + watch(`${paths.templates}/**/*.html`{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}).on("change", reload) + watch([`${paths.js}/*.js`, `!${paths.js}/*.min.js`]{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}, scripts).on("change", reload) } // Generate all assets From ee9cc876a432b9b9d414c8ff69ba3be0944a8891 Mon Sep 17 00:00:00 2001 From: Richard Hajdu Date: Sun, 28 Jun 2020 18:41:50 +0200 Subject: [PATCH 006/389] Update CONTRIBUTORS.rst --- CONTRIBUTORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 32ba496e..529c2c40 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -199,6 +199,7 @@ Listed in alphabetical order. Raphael Pierzina `@hackebrot`_ Reggie Riser `@reggieriser`_ René Muhl `@rm--`_ + Richard Hajdu `@Tusky`_ Roman Afanaskin `@siauPatrick`_ Roman Osipenko `@romanosipenko`_ Russell Davies From 435a0c0276036f8377bcda678470ff8cf51ded8a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 29 Jun 2020 13:44:24 -0700 Subject: [PATCH 007/389] Update django-extensions from 3.0.0 to 3.0.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index d127e45e..0897d9bc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,6 +36,6 @@ pre-commit==2.5.1 # https://github.com/pre-commit/pre-commit factory-boy==2.12.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.0.0 # https://github.com/django-extensions/django-extensions +django-extensions==3.0.1 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django From bed885f0010eb3530f974ce641be36ac948ad539 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 29 Jun 2020 21:51:33 +0100 Subject: [PATCH 008/389] Comment out all lines related to LaTeX --- .../compose/local/docs/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index d84f76ed..6d0ca271 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -10,11 +10,11 @@ RUN apt-get update \ && apt-get install -y libpq-dev \ # Translations dependencies && apt-get install -y gettext \ - # Uncomment below to enable Sphinx output to latex and pdf + # Uncomment below lines to enable Sphinx output to latex and pdf # && apt-get install -y texlive-latex-recommended \ - && apt-get install -y texlive-fonts-recommended \ - && apt-get install -y texlive-latex-extra \ - && apt-get install -y latexmk \ + # && apt-get install -y texlive-fonts-recommended \ + # && apt-get install -y texlive-latex-extra \ + # && apt-get install -y latexmk \ # cleaning up unused files && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -rf /var/lib/apt/lists/* From 9af7b3ad6d418773f517da535680fa112f12aaae Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 29 Jun 2020 21:52:10 +0100 Subject: [PATCH 009/389] Missing `RUN` command in Dockerfile --- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 6d0ca271..7736777b 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update \ # Requirements are installed here to ensure they will be cached. COPY ./requirements /requirements # All imports needed for autodoc. -pip install -r /requirements/local.txt -r /requirements/production.txt +RUN pip install -r /requirements/local.txt -r /requirements/production.txt WORKDIR /docs From 3d37e84973cdc597905d48bac03d21e2eb0adf69 Mon Sep 17 00:00:00 2001 From: Richard Hajdu Date: Tue, 30 Jun 2020 00:43:13 +0200 Subject: [PATCH 010/389] Update CONTRIBUTORS.rst --- CONTRIBUTORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 529c2c40..bba9554a 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -377,6 +377,7 @@ Listed in alphabetical order. .. _@reggieriser: https://github.com/reggieriser .. _@reyesvicente: https://github.com/reyesvicente .. _@rm--: https://github.com/rm-- +.. _@Tusky: https://github.com/Tusky .. _@rolep: https://github.com/rolep .. _@romanosipenko: https://github.com/romanosipenko .. _@saschalalala: https://github.com/saschalalala From 69611313c99f66d9fb74352c5de1844785ea3e06 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Tue, 30 Jun 2020 10:01:50 -0400 Subject: [PATCH 011/389] Add author name and description to HTML meta --- .../{{cookiecutter.project_slug}}/templates/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html index cba1b7cf..aa68ece3 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html @@ -5,8 +5,8 @@ {% block title %}{% endraw %}{{ cookiecutter.project_name }}{% raw %}{% endblock title %} - - + + + + +### Special Thanks + +The following haven't provided code directly, but have provided +guidance and advice. + +- Jannis Leidel +- Nate Aune +- Barry Morrison diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index f1b5e0f0..c564dfaf 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -17,7 +17,7 @@ Saurabh Kumar `@theskumar`_ @_theskumar Jannis Gebauer `@jayfk`_ Burhan Khalid `@burhan`_ @burhan Nikita Shupeyko `@webyneter`_ @webyneter -Bruno Alla               `@browniebroke`_ @_BrunoAlla +Bruno Alla `@browniebroke`_ @_BrunoAlla Wan Liuyang `@sfdye`_ @sfdye =========================== ================= =========== @@ -29,6 +29,7 @@ Daniel are on the Cookiecutter core team.* .. _@theskumar: https://github.com/theskumar .. _@audreyr: https://github.com/audreyr .. _@jayfk: https://github.com/jayfk +.. _@burhan: https://github.com/burhan .. _@webyneter: https://github.com/webyneter .. _@browniebroke: https://github.com/browniebroke .. _@sfdye: https://github.com/sfdye @@ -267,7 +268,6 @@ Listed in alphabetical order. .. _@BoPeng: https://github.com/BoPeng .. _@brentpayne: https://github.com/brentpayne .. _@btknu: https://github.com/btknu -.. _@burhan: https://github.com/burhan .. _@bwarren2: https://github.com/bwarren2 .. _@c-rhodes: https://github.com/c-rhodes .. _@caffodian: https://github.com/caffodian diff --git a/requirements.txt b/requirements.txt index 1fbc8d16..b04e4012 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,3 +16,8 @@ pytest==6.0.1 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 + +# Scripting +# ------------------------------------------------------------------------------ +requests +jinja2 diff --git a/scripts/__init__.py b/scripts/__init__.py new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/scripts/__init__.py @@ -0,0 +1 @@ + diff --git a/scripts/rst_to_json.py b/scripts/rst_to_json.py new file mode 100644 index 00000000..37f5b219 --- /dev/null +++ b/scripts/rst_to_json.py @@ -0,0 +1,102 @@ +import json +from pathlib import Path + +CURRENT_FILE = Path(__file__) +ROOT = CURRENT_FILE.parents[1] + + +def main(): + input_file_path = ROOT / "CONTRIBUTORS.rst" + with input_file_path.open() as ifd: + content = ifd.read() + + table_separator = ( + "============================= ========================== ==================" + ) + table_content = content.split(table_separator)[2] + + profiles_list = [ + { + "name": "Audrey Roy Greenfeld", + "github_login": "audreyr", + "twitter_username": "audreyr", + "is_core": True, + }, + { + "name": "Bruno Alla", + "github_login": "browniebroke", + "twitter_username": "_BrunoAlla", + "is_core": True, + }, + { + "name": "Burhan Khalid", + "github_login": "burhan", + "twitter_username": "burhan", + "is_core": True, + }, + { + "name": "Daniel Roy Greenfeld", + "github_login": "pydanny", + "twitter_username": "pydanny", + "is_core": True, + }, + { + "name": "Fábio C. Barrionuevo da Luz", + "github_login": "luzfcb", + "twitter_username": "luzfcb", + "is_core": True, + }, + { + "name": "Jannis Gebauer", + "github_login": "jayfk", + "twitter_username": "", + "is_core": True, + }, + { + "name": "Saurabh Kumar", + "github_login": "theskumar", + "twitter_username": "_theskumar", + "is_core": True, + }, + { + "name": "Shupeyko Nikita", + "github_login": "webyneter", + "twitter_username": "", + "is_core": True, + }, + { + "name": "Wan Liuyang", + "github_login": "sfdye", + "twitter_username": "sfdye", + "is_core": True, + }, + ] + core_members = [member["github_login"] for member in profiles_list] + + for contrib in table_content.split("\n"): + if not contrib: + continue + line_parts = contrib.split("`") + name = line_parts[0].strip() + github_login = line_parts[1].lstrip("@") if len(line_parts) > 1 else "" + if github_login in core_members: + continue + twitter_username = ( + line_parts[2].lstrip("_").strip().lstrip("@") + if len(line_parts) == 3 + else "" + ) + profile = { + "name": name, + "github_login": github_login, + "twitter_username": twitter_username, + } + profiles_list.append(profile) + + output_file_path = ROOT / ".github" / "contributors.json" + with output_file_path.open("w") as ofd: + json.dump(profiles_list, ofd, indent=2, ensure_ascii=False) + + +if __name__ == "__main__": + main() diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py new file mode 100644 index 00000000..2a8058bb --- /dev/null +++ b/scripts/update_contributors.py @@ -0,0 +1,130 @@ +import json +from pathlib import Path + +import requests +from jinja2 import Template + +CURRENT_FILE = Path(__file__) +ROOT = CURRENT_FILE.parents[1] +BOT_LOGINS = ["pyup-bot"] +OUTPUT_FILE_PATH = ROOT / "CONTRIBUTORS.rst" + +CONTRIBUTORS_TABLE_TEMPLATE = """ + + + + + + + {%- for contributor in contributors %} + + + + + + {%- endfor %} +
NameGithubTwitter
{{ contributor.name }} + {{ contributor.github_login }} + {{ contributor.twitter_username }}
+""" + + +def main() -> None: + gh = GitHub() + recent_authors = set(gh.iter_recent_authors()) + contrib_file = ContributorsJSONFile() + for username in recent_authors: + if username not in contrib_file: + user_data = gh.fetch_user_info(username) + contrib_file.add_contributor(user_data) + contrib_file.save() + + rst_file = ContributorsRSTFile() + rst_file.generate_table(contrib_file.content) + rst_file.save() + + +class GitHub: + base_url = "https://api.github.com" + + def __init__(self) -> None: + self.session = requests.Session() + + def request(self, endpoint): + response = self.session.get(f"{self.base_url}{endpoint}") + response.raise_for_status() + return response.json() + + def iter_recent_authors(self): + commits = self.request("/repos/pydanny/cookiecutter-django/commits") + for commit in commits: + login = commit["author"]["login"] + if login not in BOT_LOGINS: + yield login + + def fetch_user_info(self, username): + return self.request(f"/users/{username}") + + +class ContributorsJSONFile: + file_path = ROOT / ".github" / "contributors.json" + content = None + + def __init__(self) -> None: + with self.file_path.open() as fd: + self.content = json.load(fd) + + def __contains__(self, github_login: str): + return any(github_login == contrib["github_login"] for contrib in self.content) + + def add_contributor(self, user_data): + contributor_data = { + "name": user_data["name"], + "github_login": user_data["login"], + "twitter_username": user_data["twitter_username"], + } + new_content = self.content + [contributor_data] + self.content = sorted(new_content, key=lambda user: user["name"]) + + def save(self): + with self.file_path.open("w") as fd: + json.dump(self.content, fd, indent=2) + + +class ContributorsRSTFile: + file_path = ROOT / "CONTRIBUTORS.md" + content = None + marker_start = "" + marker_end = "" + + def __init__(self) -> None: + with self.file_path.open() as fd: + content = fd.read() + self.before, rest_initial = content.split(f"{self.marker_start}") + self.middle, self.after = rest_initial.split(f"{self.marker_end}") + + def generate_table(self, profiles_list): + template = Template(CONTRIBUTORS_TABLE_TEMPLATE, autoescape=True) + contributors = [profile for profile in profiles_list if not profile.get("is_core", False)] + self.middle = template.render(contributors=contributors) + + def save(self): + with self.file_path.open("w") as fd: + new_content = "\n".join( + [ + self.before, + self.marker_start, + self.middle, + self.marker_end, + self.after, + ] + ) + + fd.write(new_content) + + +if __name__ == "__main__": + template = Template(CONTRIBUTORS_TABLE_TEMPLATE, autoescape=True) + contrib_file = ContributorsJSONFile() + contributors = [profile for profile in contrib_file.content if profile.get("is_core", False)] + print(template.render(contributors=contributors)) From c57439e52206e9b70e998108310ac6a281e70a12 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 17:42:01 +0100 Subject: [PATCH 105/389] Enhancements to the script --- CONTRIBUTORS.md | 96 ------------------------------ scripts/update_contributors.py | 105 ++++++++++++++++++--------------- 2 files changed, 59 insertions(+), 142 deletions(-) delete mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md deleted file mode 100644 index b7cc186d..00000000 --- a/CONTRIBUTORS.md +++ /dev/null @@ -1,96 +0,0 @@ -# Contributors - -## Core Developers - -These contributors have commit flags for the repository, and are able to -accept and merge pull requests. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameGithubTwitter
Daniel Roy Greenfeld - pydanny - pydanny
Audrey Roy Greenfeld - audreyr - audreyr
Fábio C. Barrionuevo da Luz - luzfcb - luzfcb
Saurabh Kumar - theskumar - _theskumar
Jannis Gebauer - jayfk -
Burhan Khalid - burhan - burhan
Nikita Shupeyko - webyneter -
Bruno Alla - browniebroke - _BrunoAlla
Wan Liuyang - sfdye - sfdye
- -*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on -the Cookiecutter core team.* - -## Other Contributors - -Listed in alphabetical order. - - - - -### Special Thanks - -The following haven't provided code directly, but have provided -guidance and advice. - -- Jannis Leidel -- Nate Aune -- Barry Morrison diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 2a8058bb..6d4c3416 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -7,16 +7,22 @@ from jinja2 import Template CURRENT_FILE = Path(__file__) ROOT = CURRENT_FILE.parents[1] BOT_LOGINS = ["pyup-bot"] -OUTPUT_FILE_PATH = ROOT / "CONTRIBUTORS.rst" -CONTRIBUTORS_TABLE_TEMPLATE = """ +CONTRIBUTORS_TEMPLATE = """ +# Contributors + +## Core Developers + +These contributors have commit flags for the repository, and are able to +accept and merge pull requests. + - {%- for contributor in contributors %} + {%- for contributor in core_contributors %} {%- endfor %}
Name Github Twitter
{{ contributor.name }} @@ -26,6 +32,39 @@ CONTRIBUTORS_TABLE_TEMPLATE = """
+ +*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on +the Cookiecutter core team.* + +## Other Contributors + +Listed in alphabetical order. + + + + + + + + {%- for contributor in other_contributors %} + + + + + + {%- endfor %} +
NameGithubTwitter
{{ contributor.name }} + {{ contributor.github_login }} + {{ contributor.twitter_username }}
+ +### Special Thanks + +The following haven't provided code directly, but have provided +guidance and advice. + +- Jannis Leidel +- Nate Aune +- Barry Morrison """ @@ -34,14 +73,12 @@ def main() -> None: recent_authors = set(gh.iter_recent_authors()) contrib_file = ContributorsJSONFile() for username in recent_authors: - if username not in contrib_file: + if username not in contrib_file and username not in BOT_LOGINS: user_data = gh.fetch_user_info(username) contrib_file.add_contributor(user_data) contrib_file.save() - rst_file = ContributorsRSTFile() - rst_file.generate_table(contrib_file.content) - rst_file.save() + write_md_file(contrib_file.content) class GitHub: @@ -71,8 +108,7 @@ class ContributorsJSONFile: content = None def __init__(self) -> None: - with self.file_path.open() as fd: - self.content = json.load(fd) + self.content = json.loads(self.file_path.read_text()) def __contains__(self, github_login: str): return any(github_login == contrib["github_login"] for contrib in self.content) @@ -83,48 +119,25 @@ class ContributorsJSONFile: "github_login": user_data["login"], "twitter_username": user_data["twitter_username"], } - new_content = self.content + [contributor_data] - self.content = sorted(new_content, key=lambda user: user["name"]) + self.content.extend(contributor_data) def save(self): - with self.file_path.open("w") as fd: - json.dump(self.content, fd, indent=2) + self.file_path.write_text(json.dumps(self.content, indent=2)) -class ContributorsRSTFile: +def write_md_file(contributors): + template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True) + core_contributors = [ + c for c in contributors if c.get("is_core", False) + ] + other_contributors = sorted( + c for c in contributors if not c.get("is_core", False) + ) + content = template.render(core_contributors=core_contributors, other_contributors=other_contributors) + file_path = ROOT / "CONTRIBUTORS.md" - content = None - marker_start = "" - marker_end = "" - - def __init__(self) -> None: - with self.file_path.open() as fd: - content = fd.read() - self.before, rest_initial = content.split(f"{self.marker_start}") - self.middle, self.after = rest_initial.split(f"{self.marker_end}") - - def generate_table(self, profiles_list): - template = Template(CONTRIBUTORS_TABLE_TEMPLATE, autoescape=True) - contributors = [profile for profile in profiles_list if not profile.get("is_core", False)] - self.middle = template.render(contributors=contributors) - - def save(self): - with self.file_path.open("w") as fd: - new_content = "\n".join( - [ - self.before, - self.marker_start, - self.middle, - self.marker_end, - self.after, - ] - ) - - fd.write(new_content) + file_path.write_text(content) if __name__ == "__main__": - template = Template(CONTRIBUTORS_TABLE_TEMPLATE, autoescape=True) - contrib_file = ContributorsJSONFile() - contributors = [profile for profile in contrib_file.content if profile.get("is_core", False)] - print(template.render(contributors=contributors)) + main() From ea8cfd55a48e090ebbeb586a11a84c862c1e7006 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 17:46:34 +0100 Subject: [PATCH 106/389] More tweaks --- .github/contributors.json | 2 +- scripts/update_contributors.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/contributors.json b/.github/contributors.json index 1703b426..b915f5d5 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -988,4 +988,4 @@ "github_login": "mapx", "twitter_username": "" } -] +] \ No newline at end of file diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 6d4c3416..88b6ffa8 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -122,18 +122,18 @@ class ContributorsJSONFile: self.content.extend(contributor_data) def save(self): - self.file_path.write_text(json.dumps(self.content, indent=2)) + text_content = json.dumps(self.content, indent=2, ensure_ascii=False) + self.file_path.write_text(text_content) def write_md_file(contributors): template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True) - core_contributors = [ - c for c in contributors if c.get("is_core", False) - ] - other_contributors = sorted( - c for c in contributors if not c.get("is_core", False) + core_contributors = [c for c in contributors if c.get("is_core", False)] + other_contributors = (c for c in contributors if not c.get("is_core", False)) + other_contributors = sorted(other_contributors, key=lambda c: c["name"]) + content = template.render( + core_contributors=core_contributors, other_contributors=other_contributors ) - content = template.render(core_contributors=core_contributors, other_contributors=other_contributors) file_path = ROOT / "CONTRIBUTORS.md" file_path.write_text(content) From ceb96dddc1a4a3362f8fd35bb72d1017d0476ee4 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 17:49:38 +0100 Subject: [PATCH 107/389] Organise core contributors by date joined --- .github/contributors.json | 110 +++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/.github/contributors.json b/.github/contributors.json index b915f5d5..7a932526 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1,4 +1,58 @@ [ + { + "name": "Daniel Roy Greenfeld", + "github_login": "pydanny", + "twitter_username": "pydanny", + "is_core": true + }, + { + "name": "Audrey Roy Greenfeld", + "github_login": "audreyr", + "twitter_username": "audreyr", + "is_core": true + }, + { + "name": "Fábio C. Barrionuevo da Luz", + "github_login": "luzfcb", + "twitter_username": "luzfcb", + "is_core": true + }, + { + "name": "Saurabh Kumar", + "github_login": "theskumar", + "twitter_username": "_theskumar", + "is_core": true + }, + { + "name": "Jannis Gebauer", + "github_login": "jayfk", + "twitter_username": "", + "is_core": true + }, + { + "name": "Burhan Khalid", + "github_login": "burhan", + "twitter_username": "burhan", + "is_core": true + }, + { + "name": "Shupeyko Nikita", + "github_login": "webyneter", + "twitter_username": "webyneter", + "is_core": true + }, + { + "name": "Bruno Alla", + "github_login": "browniebroke", + "twitter_username": "_BrunoAlla", + "is_core": true + }, + { + "name": "Wan Liuyang", + "github_login": "sfdye", + "twitter_username": "sfdye", + "is_core": true + }, { "name": "18", "github_login": "dezoito", @@ -124,12 +178,6 @@ "github_login": "", "twitter_username": "" }, - { - "name": "Audrey Roy Greenfeld", - "github_login": "audreyr", - "twitter_username": "audreyr", - "is_core": true - }, { "name": "Barclay Gauld", "github_login": "yunti", @@ -185,18 +233,6 @@ "github_login": "bolivierjr", "twitter_username": "" }, - { - "name": "Bruno Alla", - "github_login": "browniebroke", - "twitter_username": "_BrunoAlla", - "is_core": true - }, - { - "name": "Burhan Khalid", - "github_login": "burhan", - "twitter_username": "burhan", - "is_core": true - }, { "name": "Caio Ariede", "github_login": "caioariede", @@ -302,12 +338,6 @@ "github_login": "danifus", "twitter_username": "" }, - { - "name": "Daniel Roy Greenfeld", - "github_login": "pydanny", - "twitter_username": "pydanny", - "is_core": true - }, { "name": "Daniel Sears", "github_login": "highpost", @@ -403,12 +433,6 @@ "github_login": "eyadsibai", "twitter_username": "" }, - { - "name": "Fábio C. Barrionuevo da Luz", - "github_login": "luzfcb", - "twitter_username": "luzfcb", - "is_core": true - }, { "name": "Felipe Arruda", "github_login": "arruda", @@ -519,12 +543,6 @@ "github_login": "jvanbrug", "twitter_username": "" }, - { - "name": "Jannis Gebauer", - "github_login": "jayfk", - "twitter_username": "", - "is_core": true - }, { "name": "Jelmer Draaijer", "github_login": "foarsitter", @@ -830,23 +848,11 @@ "github_login": "MightySCollins", "twitter_username": "" }, - { - "name": "Saurabh Kumar", - "github_login": "theskumar", - "twitter_username": "_theskumar", - "is_core": true - }, { "name": "Sascha", "github_login": "saschalalala", "twitter_username": "saschalalala" }, - { - "name": "Shupeyko Nikita", - "github_login": "webyneter", - "twitter_username": "", - "is_core": true - }, { "name": "Sławek Ehlert", "github_login": "slafs", @@ -967,12 +973,6 @@ "github_login": "archinal", "twitter_username": "" }, - { - "name": "Wan Liuyang", - "github_login": "sfdye", - "twitter_username": "sfdye", - "is_core": true - }, { "name": "Xaver Y.R. Chen", "github_login": "yrchen", @@ -988,4 +988,4 @@ "github_login": "mapx", "twitter_username": "" } -] \ No newline at end of file +] From bd381ea0bfd8aa18ccc2f6ff5d4e8e3a1a766528 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 17:56:26 +0100 Subject: [PATCH 108/389] Update the Github workflow --- .github/workflows/update-contributors.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 20593be4..9809e234 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - auto-generate-contributors jobs: build: @@ -11,8 +12,6 @@ jobs: steps: - uses: actions/checkout@v2 - with: - fetch-depth: 0 - name: Set up Python uses: actions/setup-python@v2 @@ -23,4 +22,4 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt - name: Update list - run: python scripts/update_contributors.py $GITHUB_EVENT_PATH + run: python scripts/update_contributors.py From 100a91eec33b51dc4520e521a0f367026c37b3f4 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:06:11 +0100 Subject: [PATCH 109/389] Update contributors.json with recent contributors --- .github/contributors.json | 27 ++++++++++++++++- scripts/rst_to_json.py | 61 ++++++++++++++++++++------------------- 2 files changed, 57 insertions(+), 31 deletions(-) diff --git a/.github/contributors.json b/.github/contributors.json index 7a932526..aeb0b61f 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -68,6 +68,11 @@ "github_login": "a7p", "twitter_username": "" }, + { + "name": "Aadith PM", + "github_login": "aadithpm", + "twitter_username": "" + }, { "name": "Aaron Eikenberry", "github_login": "aeikenberry", @@ -173,6 +178,11 @@ "github_login": "areski", "twitter_username": "" }, + { + "name": "AsheKR", + "github_login": "ashekr", + "twitter_username": "" + }, { "name": "Ashley Camba", "github_login": "", @@ -653,6 +663,11 @@ "github_login": "glasslion", "twitter_username": "" }, + { + "name": "Leon Kim", + "github_login": "PilhwanKim", + "twitter_username": "" + }, { "name": "Leonardo Jimenez", "github_login": "xpostudio4", @@ -733,6 +748,11 @@ "github_login": "mjsisley", "twitter_username": "" }, + { + "name": "Matthias Sieber", + "github_login": "manonthemat", + "twitter_username": "MatzeOne" + }, { "name": "Meghan Heintz", "github_login": "dot2dotseurat", @@ -828,6 +848,11 @@ "github_login": "rm--", "twitter_username": "" }, + { + "name": "Richard Hajdu", + "github_login": "Tusky", + "twitter_username": "" + }, { "name": "Roman Afanaskin", "github_login": "siauPatrick", @@ -988,4 +1013,4 @@ "github_login": "mapx", "twitter_username": "" } -] +] \ No newline at end of file diff --git a/scripts/rst_to_json.py b/scripts/rst_to_json.py index 37f5b219..1cb3f585 100644 --- a/scripts/rst_to_json.py +++ b/scripts/rst_to_json.py @@ -7,61 +7,60 @@ ROOT = CURRENT_FILE.parents[1] def main(): input_file_path = ROOT / "CONTRIBUTORS.rst" - with input_file_path.open() as ifd: - content = ifd.read() + content = input_file_path.read_text() table_separator = ( - "============================= ========================== ==================" + "========================== ============================ ==============" ) table_content = content.split(table_separator)[2] profiles_list = [ - { - "name": "Audrey Roy Greenfeld", - "github_login": "audreyr", - "twitter_username": "audreyr", - "is_core": True, - }, - { - "name": "Bruno Alla", - "github_login": "browniebroke", - "twitter_username": "_BrunoAlla", - "is_core": True, - }, - { - "name": "Burhan Khalid", - "github_login": "burhan", - "twitter_username": "burhan", - "is_core": True, - }, { "name": "Daniel Roy Greenfeld", "github_login": "pydanny", "twitter_username": "pydanny", "is_core": True, }, + { + "name": "Audrey Roy Greenfeld", + "github_login": "audreyr", + "twitter_username": "audreyr", + "is_core": True, + }, { "name": "Fábio C. Barrionuevo da Luz", "github_login": "luzfcb", "twitter_username": "luzfcb", "is_core": True, }, - { - "name": "Jannis Gebauer", - "github_login": "jayfk", - "twitter_username": "", - "is_core": True, - }, { "name": "Saurabh Kumar", "github_login": "theskumar", "twitter_username": "_theskumar", "is_core": True, }, + { + "name": "Jannis Gebauer", + "github_login": "jayfk", + "twitter_username": "", + "is_core": True, + }, + { + "name": "Burhan Khalid", + "github_login": "burhan", + "twitter_username": "burhan", + "is_core": True, + }, { "name": "Shupeyko Nikita", "github_login": "webyneter", - "twitter_username": "", + "twitter_username": "webyneter", + "is_core": True, + }, + { + "name": "Bruno Alla", + "github_login": "browniebroke", + "twitter_username": "_BrunoAlla", "is_core": True, }, { @@ -94,8 +93,10 @@ def main(): profiles_list.append(profile) output_file_path = ROOT / ".github" / "contributors.json" - with output_file_path.open("w") as ofd: - json.dump(profiles_list, ofd, indent=2, ensure_ascii=False) + output_file_path.write_text( + json.dumps(profiles_list, indent=2, ensure_ascii=False) + ) + if __name__ == "__main__": From 9344038479f7418284c0152ec9072cb35354d0b3 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:09:03 +0100 Subject: [PATCH 110/389] Update workflow to commit updated file --- .github/workflows/update-contributors.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 9809e234..a6c0e9c4 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -23,3 +23,9 @@ jobs: pip install -r requirements.txt - name: Update list run: python scripts/update_contributors.py + + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Update Contributors + file_pattern: CONTRIBUTORS.md From 673997a389a2df1f5b82c2e357c963bec995d28e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:13:42 +0100 Subject: [PATCH 111/389] Some small cleanups --- .github/browniebroke.json | 34 - .github/commits.json | 2417 --------------------- .github/workflows/update-contributors.yml | 2 +- scripts/rst_to_json.py | 5 +- scripts/update_contributors.py | 3 + 5 files changed, 5 insertions(+), 2456 deletions(-) delete mode 100644 .github/browniebroke.json delete mode 100644 .github/commits.json diff --git a/.github/browniebroke.json b/.github/browniebroke.json deleted file mode 100644 index 9f919931..00000000 --- a/.github/browniebroke.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false, - "name": "Bruno Alla", - "company": "Festicket", - "blog": "https://browniebroke.com", - "location": "London, UK", - "email": null, - "hireable": null, - "bio": null, - "twitter_username": "_BrunoAlla", - "public_repos": 149, - "public_gists": 5, - "followers": 70, - "following": 73, - "created_at": "2011-06-20T07:06:17Z", - "updated_at": "2020-07-27T15:48:03Z" -} diff --git a/.github/commits.json b/.github/commits.json deleted file mode 100644 index 69e6c72a..00000000 --- a/.github/commits.json +++ /dev/null @@ -1,2417 +0,0 @@ -[ - { - "sha": "58882b6a7d169628aa37219967b79ce0ded25500", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NTg4ODJiNmE3ZDE2OTYyOGFhMzcyMTk5NjdiNzljZTBkZWQyNTUwMA==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-29T11:32:19Z" - }, - "committer": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-29T11:32:19Z" - }, - "message": "Add missing link to Github profile", - "tree": { - "sha": "0ab2decf022f1cdbd319e2d5a897144c80dabc48", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0ab2decf022f1cdbd319e2d5a897144c80dabc48" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/58882b6a7d169628aa37219967b79ce0ded25500", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/58882b6a7d169628aa37219967b79ce0ded25500", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/58882b6a7d169628aa37219967b79ce0ded25500", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/58882b6a7d169628aa37219967b79ce0ded25500/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "b148740a212a5c1ec57f6749315117cb6944236f", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b148740a212a5c1ec57f6749315117cb6944236f" - } - ] - }, - { - "sha": "b148740a212a5c1ec57f6749315117cb6944236f", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YjE0ODc0MGEyMTJhNWMxZWM1N2Y2NzQ5MzE1MTE3Y2I2OTQ0MjM2Zg==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-29T08:29:30Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-29T08:29:30Z" - }, - "message": "Merge pull request #2707 from pydanny/pyup-update-uvicorn-0.11.6-to-0.11.7\n\nUpdate uvicorn to 0.11.7", - "tree": { - "sha": "9ca4e7226bdd7aae06fff696382f0fa0c70da970", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9ca4e7226bdd7aae06fff696382f0fa0c70da970" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/b148740a212a5c1ec57f6749315117cb6944236f", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfITNqCRBK7hj4Ov3rIwAAdHIIAG3B72SRxhLE4zvAi3CKWXJd\nMHL4JSe6JNxPME3si8AxmG3SJCTo4V6yZkpnmq5mRwgk4x5q3ofQOyZBDOhWaX9d\nFLOk0fSP266zw2oSY0ilsaS7sFxnlo98Cdr3ZJKdaKv5ldSgXeotwD2yavQbP7Rx\njT04r/9tMYuRY0nQJvJ+7HF9PVWm4ecokf9iHU9Iz/sG5SS7fNLrRFcMb+fZ6OKt\nQ1sBS1++Lnkk+IMR1r7H09+ANjCeUeuPbxUWj+cVMr0PNAsTjU213pMoTpYVY7bY\nnUF4XLz36ohhFlTBLHLMwYRwgCagh6y83iWQUaJHa+E0sgMBBcAaljm7DfNjFtM=\n=sEH3\n-----END PGP SIGNATURE-----\n", - "payload": "tree 9ca4e7226bdd7aae06fff696382f0fa0c70da970\nparent d41bf740b43bba0084307e24dcdbdea128bf45f7\nparent 4b4bda783518954fa4816947a83a357ea8b0000a\nauthor Bruno Alla 1596011370 +0100\ncommitter GitHub 1596011370 +0100\n\nMerge pull request #2707 from pydanny/pyup-update-uvicorn-0.11.6-to-0.11.7\n\nUpdate uvicorn to 0.11.7" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b148740a212a5c1ec57f6749315117cb6944236f", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "d41bf740b43bba0084307e24dcdbdea128bf45f7", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d41bf740b43bba0084307e24dcdbdea128bf45f7" - }, - { - "sha": "4b4bda783518954fa4816947a83a357ea8b0000a", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/4b4bda783518954fa4816947a83a357ea8b0000a" - } - ] - }, - { - "sha": "d41bf740b43bba0084307e24dcdbdea128bf45f7", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZDQxYmY3NDBiNDNiYmEwMDg0MzA3ZTI0ZGNkYmRlYTEyOGJmNDVmNw==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-29T08:28:28Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-29T08:28:28Z" - }, - "message": "Merge pull request #2706 from pydanny/pyup-update-tox-3.18.0-to-3.18.1\n\nUpdate tox to 3.18.1", - "tree": { - "sha": "4e42b5dad2bdbeaf7431eee6b4ce34349cefa277", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/4e42b5dad2bdbeaf7431eee6b4ce34349cefa277" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfITMsCRBK7hj4Ov3rIwAAdHIIAETVssfXHqUeUnUUXbZfxCyY\nNcJ5Uj2K6AfKt9DyM2/5UdqzDIRb3WNrAt+rjaZvlu3onUPKKJAiP38hMIZklTiJ\nLuqMema8u0ED3h3TpgLcUlpziNCEzFRkANg/XVvhYQc9uVnzVRD375NXyRYuUtZw\nBc9C/l5D0P/hsAYxzgaxg+bVqyqNfzHB+e+/FIyGbgYaVetMydaey2uDCWk/Wd7z\n1u9DVRnK8KylkkUEN7Swjz4PFftyHlCmWNJ9Ee4mTrOIhiAOZlzfkMz3ihTiZnrp\nxfN8eUqjSEsIPXEaMTgedtm8WfuOgR5dTTgpmcB9/L1NZslTJ91dwgpkcvj0Odg=\n=TCyB\n-----END PGP SIGNATURE-----\n", - "payload": "tree 4e42b5dad2bdbeaf7431eee6b4ce34349cefa277\nparent 0f1dfdd72edc05f5c56fceeb0ab5632458f72c12\nparent 84a3082527d322f4f9bd64ab0675ecd3a256d2af\nauthor Bruno Alla 1596011308 +0100\ncommitter GitHub 1596011308 +0100\n\nMerge pull request #2706 from pydanny/pyup-update-tox-3.18.0-to-3.18.1\n\nUpdate tox to 3.18.1" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d41bf740b43bba0084307e24dcdbdea128bf45f7", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12" - }, - { - "sha": "84a3082527d322f4f9bd64ab0675ecd3a256d2af", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/84a3082527d322f4f9bd64ab0675ecd3a256d2af" - } - ] - }, - { - "sha": "4b4bda783518954fa4816947a83a357ea8b0000a", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NGI0YmRhNzgzNTE4OTU0ZmE0ODE2OTQ3YTgzYTM1N2VhOGIwMDAwYQ==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-28T13:34:49Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-28T13:34:49Z" - }, - "message": "Update uvicorn from 0.11.6 to 0.11.7", - "tree": { - "sha": "d9ddd166ad5771852efcc336de4a94b072562c1f", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/d9ddd166ad5771852efcc336de4a94b072562c1f" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/4b4bda783518954fa4816947a83a357ea8b0000a", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/4b4bda783518954fa4816947a83a357ea8b0000a", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12" - } - ] - }, - { - "sha": "84a3082527d322f4f9bd64ab0675ecd3a256d2af", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ODRhMzA4MjUyN2QzMjJmNGY5YmQ2NGFiMDY3NWVjZDNhMjU2ZDJhZg==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-28T13:34:45Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-28T13:34:45Z" - }, - "message": "Update tox from 3.18.0 to 3.18.1", - "tree": { - "sha": "4e42b5dad2bdbeaf7431eee6b4ce34349cefa277", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/4e42b5dad2bdbeaf7431eee6b4ce34349cefa277" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/84a3082527d322f4f9bd64ab0675ecd3a256d2af", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12" - } - ] - }, - { - "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MGYxZGZkZDcyZWRjMDVmNWM1NmZjZWViMGFiNTYzMjQ1OGY3MmMxMg==", - "commit": { - "author": { - "name": "Fábio C. Barrionuevo da Luz", - "email": "bnafta@gmail.com", - "date": "2020-07-27T21:22:54Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-27T21:22:54Z" - }, - "message": "Merge pull request #2704 from manonthemat/master\n\nAdded most recent supported PostgreSQL version in documentation", - "tree": { - "sha": "65b3bf322fc9661584a23fb498566e56d3d81f5a", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/65b3bf322fc9661584a23fb498566e56d3d81f5a" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfH0WuCRBK7hj4Ov3rIwAAdHIIAIHvd/XGFoeYyWFPH0i8T9nZ\nCn0jCJTcV4sgzUt2NrvCniNotKUzJAIguAcQpZACNhrzHwL5vSi7FoOtNtqyy5L8\nLI6aonjcS9D8Ug2LvnSAJpQ9R/BR1VDWNPsHytWbeHDjmVfXRmX9Ngt+GvUPMMUV\nu+k2QXQtLaLzSusDuwMWgO7ekfwJrrPXou9MF0GGbRDEtVHEz14vdgM7cJ2Y/O42\nObfDAQyL1KEn6jgJR55hZzQgAYPl5tO5q3FCpRWyVzlK0ZgMNvSDykxJ/h4KfAtj\n8VId/yKH2odHHgYeT+xkx638bI13XEDUL0FibyWBA13XqriUDVEf2sRslE24d04=\n=p3nH\n-----END PGP SIGNATURE-----\n", - "payload": "tree 65b3bf322fc9661584a23fb498566e56d3d81f5a\nparent a4f7fb41d77679ff11891c0c04bf38c1a2712086\nparent 279175a3447b7754769a33a69441d9cd566025e0\nauthor Fábio C. Barrionuevo da Luz 1595884974 -0300\ncommitter GitHub 1595884974 -0300\n\nMerge pull request #2704 from manonthemat/master\n\nAdded most recent supported PostgreSQL version in documentation" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12/comments", - "author": { - "login": "luzfcb", - "id": 807599, - "node_id": "MDQ6VXNlcjgwNzU5OQ==", - "avatar_url": "https://avatars0.githubusercontent.com/u/807599?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/luzfcb", - "html_url": "https://github.com/luzfcb", - "followers_url": "https://api.github.com/users/luzfcb/followers", - "following_url": "https://api.github.com/users/luzfcb/following{/other_user}", - "gists_url": "https://api.github.com/users/luzfcb/gists{/gist_id}", - "starred_url": "https://api.github.com/users/luzfcb/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/luzfcb/subscriptions", - "organizations_url": "https://api.github.com/users/luzfcb/orgs", - "repos_url": "https://api.github.com/users/luzfcb/repos", - "events_url": "https://api.github.com/users/luzfcb/events{/privacy}", - "received_events_url": "https://api.github.com/users/luzfcb/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086" - }, - { - "sha": "279175a3447b7754769a33a69441d9cd566025e0", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/279175a3447b7754769a33a69441d9cd566025e0" - } - ] - }, - { - "sha": "279175a3447b7754769a33a69441d9cd566025e0", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6Mjc5MTc1YTM0NDdiNzc1NDc2OWEzM2E2OTQ0MWQ5Y2Q1NjYwMjVlMA==", - "commit": { - "author": { - "name": "Matthias Sieber", - "email": "matthiasksieber@gmail.com", - "date": "2020-07-27T21:14:15Z" - }, - "committer": { - "name": "Matthias Sieber", - "email": "matthiasksieber@gmail.com", - "date": "2020-07-27T21:14:15Z" - }, - "message": "updated docs", - "tree": { - "sha": "65b3bf322fc9661584a23fb498566e56d3d81f5a", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/65b3bf322fc9661584a23fb498566e56d3d81f5a" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/279175a3447b7754769a33a69441d9cd566025e0", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/279175a3447b7754769a33a69441d9cd566025e0", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0/comments", - "author": { - "login": "manonthemat", - "id": 5065940, - "node_id": "MDQ6VXNlcjUwNjU5NDA=", - "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/manonthemat", - "html_url": "https://github.com/manonthemat", - "followers_url": "https://api.github.com/users/manonthemat/followers", - "following_url": "https://api.github.com/users/manonthemat/following{/other_user}", - "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}", - "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions", - "organizations_url": "https://api.github.com/users/manonthemat/orgs", - "repos_url": "https://api.github.com/users/manonthemat/repos", - "events_url": "https://api.github.com/users/manonthemat/events{/privacy}", - "received_events_url": "https://api.github.com/users/manonthemat/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "manonthemat", - "id": 5065940, - "node_id": "MDQ6VXNlcjUwNjU5NDA=", - "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/manonthemat", - "html_url": "https://github.com/manonthemat", - "followers_url": "https://api.github.com/users/manonthemat/followers", - "following_url": "https://api.github.com/users/manonthemat/following{/other_user}", - "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}", - "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions", - "organizations_url": "https://api.github.com/users/manonthemat/orgs", - "repos_url": "https://api.github.com/users/manonthemat/repos", - "events_url": "https://api.github.com/users/manonthemat/events{/privacy}", - "received_events_url": "https://api.github.com/users/manonthemat/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "d5d4941d2286671dd7f7eda19f0001b98dbb9095", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d5d4941d2286671dd7f7eda19f0001b98dbb9095" - } - ] - }, - { - "sha": "d5d4941d2286671dd7f7eda19f0001b98dbb9095", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZDVkNDk0MWQyMjg2NjcxZGQ3ZjdlZGExOWYwMDAxYjk4ZGJiOTA5NQ==", - "commit": { - "author": { - "name": "Matthias Sieber", - "email": "matthiasksieber@gmail.com", - "date": "2020-07-27T21:12:33Z" - }, - "committer": { - "name": "Matthias Sieber", - "email": "matthiasksieber@gmail.com", - "date": "2020-07-27T21:12:33Z" - }, - "message": "added to list of other contributors", - "tree": { - "sha": "deb68fe1649f8b5346277947378d224645d52aff", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/deb68fe1649f8b5346277947378d224645d52aff" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d5d4941d2286671dd7f7eda19f0001b98dbb9095", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095/comments", - "author": { - "login": "manonthemat", - "id": 5065940, - "node_id": "MDQ6VXNlcjUwNjU5NDA=", - "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/manonthemat", - "html_url": "https://github.com/manonthemat", - "followers_url": "https://api.github.com/users/manonthemat/followers", - "following_url": "https://api.github.com/users/manonthemat/following{/other_user}", - "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}", - "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions", - "organizations_url": "https://api.github.com/users/manonthemat/orgs", - "repos_url": "https://api.github.com/users/manonthemat/repos", - "events_url": "https://api.github.com/users/manonthemat/events{/privacy}", - "received_events_url": "https://api.github.com/users/manonthemat/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "manonthemat", - "id": 5065940, - "node_id": "MDQ6VXNlcjUwNjU5NDA=", - "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/manonthemat", - "html_url": "https://github.com/manonthemat", - "followers_url": "https://api.github.com/users/manonthemat/followers", - "following_url": "https://api.github.com/users/manonthemat/following{/other_user}", - "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}", - "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions", - "organizations_url": "https://api.github.com/users/manonthemat/orgs", - "repos_url": "https://api.github.com/users/manonthemat/repos", - "events_url": "https://api.github.com/users/manonthemat/events{/privacy}", - "received_events_url": "https://api.github.com/users/manonthemat/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "5500af7364e3ff0d2ead6b7100e8884e0ace785b", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/5500af7364e3ff0d2ead6b7100e8884e0ace785b" - } - ] - }, - { - "sha": "5500af7364e3ff0d2ead6b7100e8884e0ace785b", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NTUwMGFmNzM2NGUzZmYwZDJlYWQ2YjcxMDBlODg4NGUwYWNlNzg1Yg==", - "commit": { - "author": { - "name": "Matthias Sieber", - "email": "matthiasksieber@gmail.com", - "date": "2020-07-27T21:08:56Z" - }, - "committer": { - "name": "Matthias Sieber", - "email": "matthiasksieber@gmail.com", - "date": "2020-07-27T21:08:56Z" - }, - "message": "update Readme w/ current PostgreSQL version support", - "tree": { - "sha": "76b325e32d6e4ad0ce77075efc485722922180ca", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/76b325e32d6e4ad0ce77075efc485722922180ca" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/5500af7364e3ff0d2ead6b7100e8884e0ace785b", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b/comments", - "author": { - "login": "manonthemat", - "id": 5065940, - "node_id": "MDQ6VXNlcjUwNjU5NDA=", - "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/manonthemat", - "html_url": "https://github.com/manonthemat", - "followers_url": "https://api.github.com/users/manonthemat/followers", - "following_url": "https://api.github.com/users/manonthemat/following{/other_user}", - "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}", - "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions", - "organizations_url": "https://api.github.com/users/manonthemat/orgs", - "repos_url": "https://api.github.com/users/manonthemat/repos", - "events_url": "https://api.github.com/users/manonthemat/events{/privacy}", - "received_events_url": "https://api.github.com/users/manonthemat/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "manonthemat", - "id": 5065940, - "node_id": "MDQ6VXNlcjUwNjU5NDA=", - "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/manonthemat", - "html_url": "https://github.com/manonthemat", - "followers_url": "https://api.github.com/users/manonthemat/followers", - "following_url": "https://api.github.com/users/manonthemat/following{/other_user}", - "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}", - "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions", - "organizations_url": "https://api.github.com/users/manonthemat/orgs", - "repos_url": "https://api.github.com/users/manonthemat/repos", - "events_url": "https://api.github.com/users/manonthemat/events{/privacy}", - "received_events_url": "https://api.github.com/users/manonthemat/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086" - } - ] - }, - { - "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTRmN2ZiNDFkNzc2NzlmZjExODkxYzBjMDRiZjM4YzFhMjcxMjA4Ng==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-26T15:07:29Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-26T15:07:29Z" - }, - "message": "Merge pull request #2702 from pydanny/pyup-update-django-anymail-7.1.0-to-7.2", - "tree": { - "sha": "0375fcc81dcd9233ec3f230f56cc22ee203dae6e", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0375fcc81dcd9233ec3f230f56cc22ee203dae6e" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHZwxCRBK7hj4Ov3rIwAAdHIIABXB6C6RqSDq9/p853HsQlTq\nUS4hczA2CkyBsf3j7v+bxchKq3t6ilG6XOhnuaTYA9PcfOb8cXYjVl1prmZZ/wO0\nczIZ1qlo5lMJWr6OGvo5/oY58LM7zbq8LDpBz/v5qghBbL9GDMbF8gwmyS2CH+DV\nzPRwzf3P0q9mbBXgw/t1lkUJ5C3KzM/lYaBI0SdZJR39HM7FbOuOTytkHuyr+SPw\nPRUo0CMoTiaGXikdNF8QaYDnEMZ+3pr1rTt3dkejivRlgrNLnhEKOsS1LU/tlyyP\ndah6pgIk7Q2b7PndjHwjpqTK4uBXX1g410gxMrPck48hRXh06qUzRqg43/Fq/RI=\n=bQej\n-----END PGP SIGNATURE-----\n", - "payload": "tree 0375fcc81dcd9233ec3f230f56cc22ee203dae6e\nparent 08a15337b35e1c11d9ef1494e9550ceaee7e9e72\nparent c3391c957284f6ec956a0ee2043e2389fb34e0db\nauthor Bruno Alla 1595776049 +0100\ncommitter GitHub 1595776049 +0100\n\nMerge pull request #2702 from pydanny/pyup-update-django-anymail-7.1.0-to-7.2\n\n" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72" - }, - { - "sha": "c3391c957284f6ec956a0ee2043e2389fb34e0db", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c3391c957284f6ec956a0ee2043e2389fb34e0db" - } - ] - }, - { - "sha": "c3391c957284f6ec956a0ee2043e2389fb34e0db", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YzMzOTFjOTU3Mjg0ZjZlYzk1NmEwZWUyMDQzZTIzODlmYjM0ZTBkYg==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:40Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:40Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "0375fcc81dcd9233ec3f230f56cc22ee203dae6e", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0375fcc81dcd9233ec3f230f56cc22ee203dae6e" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c3391c957284f6ec956a0ee2043e2389fb34e0db", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "83290cb71073dd614957a1db884977519cabf84b", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/83290cb71073dd614957a1db884977519cabf84b" - } - ] - }, - { - "sha": "83290cb71073dd614957a1db884977519cabf84b", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ODMyOTBjYjcxMDczZGQ2MTQ5NTdhMWRiODg0OTc3NTE5Y2FiZjg0Yg==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:40Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:40Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "05060edb8aac5e351483de491e141c9fd2589f28", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/05060edb8aac5e351483de491e141c9fd2589f28" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/83290cb71073dd614957a1db884977519cabf84b", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/83290cb71073dd614957a1db884977519cabf84b", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "8fa56b3c6d5c3a72b9e668628921503c64d9c681", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8fa56b3c6d5c3a72b9e668628921503c64d9c681" - } - ] - }, - { - "sha": "8fa56b3c6d5c3a72b9e668628921503c64d9c681", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6OGZhNTZiM2M2ZDVjM2E3MmI5ZTY2ODYyODkyMTUwM2M2NGQ5YzY4MQ==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:39Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:39Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "1e62554b19d68a420a9163292319bbec73de0ef2", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/1e62554b19d68a420a9163292319bbec73de0ef2" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8fa56b3c6d5c3a72b9e668628921503c64d9c681", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "1d8f637f9d9bd7db556fff133961f1dba0f4cb7f", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f" - } - ] - }, - { - "sha": "1d8f637f9d9bd7db556fff133961f1dba0f4cb7f", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MWQ4ZjYzN2Y5ZDliZDdkYjU1NmZmZjEzMzk2MWYxZGJhMGY0Y2I3Zg==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:38Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:38Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "900ca3b2da13177d4c3d1f6efea392f1523aa181", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/900ca3b2da13177d4c3d1f6efea392f1523aa181" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "14fad9247b0ab845f91d9c2e21f7483836fdba77", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/14fad9247b0ab845f91d9c2e21f7483836fdba77" - } - ] - }, - { - "sha": "14fad9247b0ab845f91d9c2e21f7483836fdba77", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MTRmYWQ5MjQ3YjBhYjg0NWY5MWQ5YzJlMjFmNzQ4MzgzNmZkYmE3Nw==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:37Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:37Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "dcdbfb44993b3a6530ba8476f20d981278354bc2", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/dcdbfb44993b3a6530ba8476f20d981278354bc2" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/14fad9247b0ab845f91d9c2e21f7483836fdba77", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453" - } - ] - }, - { - "sha": "a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTVlNzFhYjhiZmU1MDVjYmU2N2JhMzRiMGJkNjcwMmQyY2VkYjQ1Mw==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:36Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:36Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "9d650cd11c7238557d41e8fc9f2d4d8925869069", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9d650cd11c7238557d41e8fc9f2d4d8925869069" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "41dc9424f8503083d52a2808451bf9ff112d9e60", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/41dc9424f8503083d52a2808451bf9ff112d9e60" - } - ] - }, - { - "sha": "41dc9424f8503083d52a2808451bf9ff112d9e60", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NDFkYzk0MjRmODUwMzA4M2Q1MmEyODA4NDUxYmY5ZmYxMTJkOWU2MA==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:35Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:35Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "cb0e7670c5dd2e7011707a9cd2abbb6357f8099b", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/cb0e7670c5dd2e7011707a9cd2abbb6357f8099b" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/41dc9424f8503083d52a2808451bf9ff112d9e60", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/41dc9424f8503083d52a2808451bf9ff112d9e60", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "756031c351c7e6e24e33006c21fc3b757d755b22", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/756031c351c7e6e24e33006c21fc3b757d755b22" - } - ] - }, - { - "sha": "756031c351c7e6e24e33006c21fc3b757d755b22", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NzU2MDMxYzM1MWM3ZTZlMjRlMzMwMDZjMjFmYzNiNzU3ZDc1NWIyMg==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:34Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:34Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "8d9efbdbfbd9d9aefa59ba54869fea143b010819", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/8d9efbdbfbd9d9aefa59ba54869fea143b010819" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/756031c351c7e6e24e33006c21fc3b757d755b22", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/756031c351c7e6e24e33006c21fc3b757d755b22", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "a706ab826c4685e61331e622e1382075ae5343a4", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a706ab826c4685e61331e622e1382075ae5343a4" - } - ] - }, - { - "sha": "a706ab826c4685e61331e622e1382075ae5343a4", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTcwNmFiODI2YzQ2ODVlNjEzMzFlNjIyZTEzODIwNzVhZTUzNDNhNA==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:33Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-25T19:51:33Z" - }, - "message": "Update django-anymail from 7.1.0 to 7.2", - "tree": { - "sha": "a4ce2b76d7b4cc7b609702844ad9d0d2bcf063a7", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/a4ce2b76d7b4cc7b609702844ad9d0d2bcf063a7" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a706ab826c4685e61331e622e1382075ae5343a4", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a706ab826c4685e61331e622e1382075ae5343a4", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72" - } - ] - }, - { - "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MDhhMTUzMzdiMzVlMWMxMWQ5ZWYxNDk0ZTk1NTBjZWFlZTdlOWU3Mg==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-25T13:39:04Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-25T13:39:04Z" - }, - "message": "Update document.rst", - "tree": { - "sha": "7789dbf8a3fa174c424491e150d08aa6edd05701", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/7789dbf8a3fa174c424491e150d08aa6edd05701" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHDX4CRBK7hj4Ov3rIwAAdHIIADQkdEs2ZlxuGXwM6MZG+5IM\n1dwuGXOx3R/kfpEJ0M6VrXqgpN0SemKGLsYFzEZ7V/v+Mpw8J74lYvvx6qRtpTUO\nT9MU8bVkxNaLN03ecxz42rI2zIT3frsQ1tVLvlXT387OknLiZOwa0G5uAb9jyEUO\n95umUw/RcKmNASABuLsEiRYNuAEDc1LKLR+uiVHJulfpdcEydnvB7JdzKlOeYvi9\nwnmJk658PqDTl03jo7NvGYTzmw8vY5N0wHPDnzvYQExuiGi8w1WawA7piychTwJ3\ngfLl6xAwKL2jYYZdhdiJAzf5LMZFGpRI2Ox9KSy8hjHcz5nwChYsO2Gp5ORSIz0=\n=O8Me\n-----END PGP SIGNATURE-----\n", - "payload": "tree 7789dbf8a3fa174c424491e150d08aa6edd05701\nparent b592003f87ff4a1f27dfa01e8860bb0f725e0847\nauthor Bruno Alla 1595684344 +0100\ncommitter GitHub 1595684344 +0100\n\nUpdate document.rst" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "b592003f87ff4a1f27dfa01e8860bb0f725e0847", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b592003f87ff4a1f27dfa01e8860bb0f725e0847" - } - ] - }, - { - "sha": "b592003f87ff4a1f27dfa01e8860bb0f725e0847", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YjU5MjAwM2Y4N2ZmNGExZjI3ZGZhMDFlODg2MGJiMGY3MjVlMDg0Nw==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-25T13:37:54Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-25T13:37:54Z" - }, - "message": "Fix snippet in documentation", - "tree": { - "sha": "d5ca93ca4e670725066520ed2bb755f11a403e11", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/d5ca93ca4e670725066520ed2bb755f11a403e11" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHDWyCRBK7hj4Ov3rIwAAdHIIAHv6JNwk75EgGqHQO1an+G3C\njcz00Hm40CJOPYHT8z3A24qoAMVrYMbgKob4f74FiVRiA88fA3BXFvOD/MiO1TAp\nI+nx54gJ8Kf7/Rj+szVcZoQ722Jc1Cnh/IaMZDJvYUQNzSkHLH4Hc+dyh5CI4WLc\nhNrXUMliwLQMShs68lCaoCZWl17APPUrUsQO8s2z32fVusm9VoJbSPBRSrtne27M\nxYjs1PfrqUTtNq3/bCUmlGVrKFviUMXaTvUjKk3842kEirDZL2DOosierkDKKga1\n6w+RM3uxU17g+d/nchjJJwhGYAtvSscJpXMjPgjUu/5SmcPkfvXt2tLjY5XJE1g=\n=3CyH\n-----END PGP SIGNATURE-----\n", - "payload": "tree d5ca93ca4e670725066520ed2bb755f11a403e11\nparent c085afef18a2643652c60422fb60718797324f4a\nauthor Bruno Alla 1595684274 +0100\ncommitter GitHub 1595684274 +0100\n\nFix snippet in documentation" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b592003f87ff4a1f27dfa01e8860bb0f725e0847", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "c085afef18a2643652c60422fb60718797324f4a", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c085afef18a2643652c60422fb60718797324f4a" - } - ] - }, - { - "sha": "c085afef18a2643652c60422fb60718797324f4a", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YzA4NWFmZWYxOGEyNjQzNjUyYzYwNDIyZmI2MDcxODc5NzMyNGY0YQ==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-24T17:20:45Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-24T17:20:45Z" - }, - "message": "Merge pull request #2700 from pydanny/pyup-update-hiredis-1.0.1-to-1.1.0", - "tree": { - "sha": "a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/c085afef18a2643652c60422fb60718797324f4a", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxhtCRBK7hj4Ov3rIwAAdHIIAJSOFFFcVkCc7RA1WYjvswmi\nW9FeGeh5XCdJCOhomhlyNWTcD9EAeNxJZh3YxNNNwiNqA00K6fBDwppnw+ZXt+wo\n+xiipqL/RJ4nqZV3LkEDdRs/Upl0013eseuw1NoYb41vw0ouvehmlGetCbyOt3Yx\n487mo2l2jJ7yLSErYQ97RllN44JOqye7Kzwdd9RpkFrSiuLynPGIBHMa5Tk3HuRV\nYOl2XTKrfGEI6jcMUXyPqvjoxvAZttURqcDzHC7F41o2HbsDSW1pxpID/RTOLEZV\n5RrwZ75Um9bkyuUya+XXtlmYCleoXDOgp3HNCumN3JNylLdT314vg/uigs2wOZo=\n=7Z4H\n-----END PGP SIGNATURE-----\n", - "payload": "tree a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead\nparent 10224378748331db092e60b52a700d93062ecbb5\nparent ce0f2363e01c49c5146d2239fcb15eb989cb509d\nauthor Bruno Alla 1595611245 +0100\ncommitter GitHub 1595611245 +0100\n\nMerge pull request #2700 from pydanny/pyup-update-hiredis-1.0.1-to-1.1.0\n\n" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c085afef18a2643652c60422fb60718797324f4a", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "10224378748331db092e60b52a700d93062ecbb5", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/10224378748331db092e60b52a700d93062ecbb5" - }, - { - "sha": "ce0f2363e01c49c5146d2239fcb15eb989cb509d", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ce0f2363e01c49c5146d2239fcb15eb989cb509d" - } - ] - }, - { - "sha": "10224378748331db092e60b52a700d93062ecbb5", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MTAyMjQzNzg3NDgzMzFkYjA5MmU2MGI1MmE3MDBkOTMwNjJlY2JiNQ==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-24T17:18:49Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-24T17:18:49Z" - }, - "message": "Merge pull request #2701 from pydanny/pyup-update-django-crispy-forms-1.9.1-to-1.9.2\n\nUpdate django-crispy-forms to 1.9.2", - "tree": { - "sha": "2dbe79439e622583fa67bbb91e75a741bec93339", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2dbe79439e622583fa67bbb91e75a741bec93339" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/10224378748331db092e60b52a700d93062ecbb5", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxf5CRBK7hj4Ov3rIwAAdHIIAD+elAUiHpBeqyB5zY5lYfE1\n+HgpvqFdS0bZLhYQw8tnOnrJLmXxZ+bx4uiAMjQuBnR5CkhXnyiaApt9kcT8xDyc\ngw9sbmnSq2Qe3C1wef+am62iEqBbujHvNJp/x9td2w6bzLYP3Hdezmkmx85+f0Ql\n0y1BM4c4BjJNPNBJRkf9oHpMkBQ21xu1qruVRjEYp/rK0Ijtj5sY/8Ih9f2xPut6\ndMGCBRFA/91LSDDlKIJUDcslrphAbagU3wqOe5rEDFIt6jfmz0UyWD8Bq4vj66g5\n+rtMDoH0Mto1Y4fT5OodU/BNKjEshY3hel0yQShd+7Qe2FmLco4qSFj4B3JS1JI=\n=UAz/\n-----END PGP SIGNATURE-----\n", - "payload": "tree 2dbe79439e622583fa67bbb91e75a741bec93339\nparent 8d52025c20af27b988d7cf53485740e4293b7b24\nparent 70c11fa89432815ebbe569ac1f18e19ff8047e36\nauthor Bruno Alla 1595611129 +0100\ncommitter GitHub 1595611129 +0100\n\nMerge pull request #2701 from pydanny/pyup-update-django-crispy-forms-1.9.1-to-1.9.2\n\nUpdate django-crispy-forms to 1.9.2" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/10224378748331db092e60b52a700d93062ecbb5", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "8d52025c20af27b988d7cf53485740e4293b7b24", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24" - }, - { - "sha": "70c11fa89432815ebbe569ac1f18e19ff8047e36", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/70c11fa89432815ebbe569ac1f18e19ff8047e36" - } - ] - }, - { - "sha": "70c11fa89432815ebbe569ac1f18e19ff8047e36", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NzBjMTFmYTg5NDMyODE1ZWJiZTU2OWFjMWYxOGUxOWZmODA0N2UzNg==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-24T16:58:32Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-24T16:58:32Z" - }, - "message": "Update django-crispy-forms from 1.9.1 to 1.9.2", - "tree": { - "sha": "2dbe79439e622583fa67bbb91e75a741bec93339", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2dbe79439e622583fa67bbb91e75a741bec93339" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/70c11fa89432815ebbe569ac1f18e19ff8047e36", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "8d52025c20af27b988d7cf53485740e4293b7b24", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24" - } - ] - }, - { - "sha": "ce0f2363e01c49c5146d2239fcb15eb989cb509d", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6Y2UwZjIzNjNlMDFjNDljNTE0NmQyMjM5ZmNiMTVlYjk4OWNiNTA5ZA==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-24T16:58:28Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-24T16:58:28Z" - }, - "message": "Update hiredis from 1.0.1 to 1.1.0", - "tree": { - "sha": "965de49b571e261b7d25fa32593cea9afbce6850", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/965de49b571e261b7d25fa32593cea9afbce6850" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ce0f2363e01c49c5146d2239fcb15eb989cb509d", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "ed8e3073c66d70d79cd350d39b40e55763da9d24", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ed8e3073c66d70d79cd350d39b40e55763da9d24" - } - ] - }, - { - "sha": "ed8e3073c66d70d79cd350d39b40e55763da9d24", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZWQ4ZTMwNzNjNjZkNzBkNzljZDM1MGQzOWI0MGU1NTc2M2RhOWQyNA==", - "commit": { - "author": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-24T16:58:27Z" - }, - "committer": { - "name": "pyup-bot", - "email": "github-bot@pyup.io", - "date": "2020-07-24T16:58:27Z" - }, - "message": "Update hiredis from 1.0.1 to 1.1.0", - "tree": { - "sha": "e4102b18d87a2b4e74b1de5d6652bf0f9de11653", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/e4102b18d87a2b4e74b1de5d6652bf0f9de11653" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ed8e3073c66d70d79cd350d39b40e55763da9d24", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24/comments", - "author": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "pyup-bot", - "id": 16239342, - "node_id": "MDQ6VXNlcjE2MjM5MzQy", - "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/pyup-bot", - "html_url": "https://github.com/pyup-bot", - "followers_url": "https://api.github.com/users/pyup-bot/followers", - "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}", - "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}", - "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions", - "organizations_url": "https://api.github.com/users/pyup-bot/orgs", - "repos_url": "https://api.github.com/users/pyup-bot/repos", - "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}", - "received_events_url": "https://api.github.com/users/pyup-bot/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "8d52025c20af27b988d7cf53485740e4293b7b24", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24" - } - ] - }, - { - "sha": "8d52025c20af27b988d7cf53485740e4293b7b24", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6OGQ1MjAyNWMyMGFmMjdiOTg4ZDdjZjUzNDg1NzQwZTQyOTNiN2IyNA==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-24T16:55:47Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-24T16:55:47Z" - }, - "message": "Merge pull request #2699 from pydanny/fix-pyup-duplicated-requirements\n\nImport base requirements without the leading dot", - "tree": { - "sha": "0c1fb9ac5638d2b89124f15a960c2e441469d37e", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0c1fb9ac5638d2b89124f15a960c2e441469d37e" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/8d52025c20af27b988d7cf53485740e4293b7b24", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxKTCRBK7hj4Ov3rIwAAdHIIAKB6P/vt541Qe+EtHBzTQ458\nGskZViSFx+3pBVPZX0iKzAGyi/1DYt/s0yq5JwZqh720ag3yyrc57EjDMpWa2oIc\nsszzRCZ318XWQgJWdeixug4Bfu54vZn1WqDRIg3HcFv5m6J4VH4jQNJvD5OAz11O\nvfhnm4nuYxju3qiJMLpck5HdWiePjNapnTZQcqbFH72+OCttDcuydEJh8RExs1JV\nET9IEG7YBy9jy3ORsdh7Rkz2eYtRN22bKd6rUDWWLVZMadSTiOmiDsyg0PDi3Xn9\nTjQJpBFus9sUx+izsZwtyy+hwiK5u7If0qHbPitMx6JxbLZ2zj/eqLYX9Nmp6HA=\n=Stvk\n-----END PGP SIGNATURE-----\n", - "payload": "tree 0c1fb9ac5638d2b89124f15a960c2e441469d37e\nparent e2910a322216fc8f15e0eaaf806805d6b744a8c2\nparent 21c56bb97a59d69e71fcaebdde6d7715d25a9150\nauthor Bruno Alla 1595609747 +0100\ncommitter GitHub 1595609747 +0100\n\nMerge pull request #2699 from pydanny/fix-pyup-duplicated-requirements\n\nImport base requirements without the leading dot" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "e2910a322216fc8f15e0eaaf806805d6b744a8c2", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/e2910a322216fc8f15e0eaaf806805d6b744a8c2" - }, - { - "sha": "21c56bb97a59d69e71fcaebdde6d7715d25a9150", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/21c56bb97a59d69e71fcaebdde6d7715d25a9150" - } - ] - }, - { - "sha": "e2910a322216fc8f15e0eaaf806805d6b744a8c2", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZTI5MTBhMzIyMjE2ZmM4ZjE1ZTBlYWFmODA2ODA1ZDZiNzQ0YThjMg==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-24T16:40:23Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-24T16:40:23Z" - }, - "message": "Merge pull request #2694 from Andrew-Chen-Wang/patch-7", - "tree": { - "sha": "2a20bcceea76b92fe7f695653db4874f4ef4ad0e", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2a20bcceea76b92fe7f695653db4874f4ef4ad0e" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGw73CRBK7hj4Ov3rIwAAdHIIAEJOH6/+qipOrjlfCtv5GpSH\nzlfv0qISPl3xz28C+kLC5uDGmGUL5rTRNdcZIFlDwr1oFfsLkSpCHDhMXJ1Lfp0b\nN0sq0VP4OHug46jiQplV1rtN0oif+xJlNNUMpq9pP5Cq5QL2lTlss/f9nAY1Hqr/\nvNeKxxRf57wbDXJARyaHFdG7FZK7qmQeObif4Q/Zp0pg0Cpn9yr5Jv0t/hJawxr5\nFVY50NHNtPLufBnrK8czh4mikzfx2po3Ly0iPXTcKN4U4JyJBG3FlCsw7ynQW97j\nx0AaJfqVXXOIJJAaTBE/HRL5l5Q4HK/teNVOcjZMKfUcPzZH0X7+xuriifEkXfQ=\n=Dh/9\n-----END PGP SIGNATURE-----\n", - "payload": "tree 2a20bcceea76b92fe7f695653db4874f4ef4ad0e\nparent 3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188\nparent c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3\nauthor Bruno Alla 1595608823 +0100\ncommitter GitHub 1595608823 +0100\n\nMerge pull request #2694 from Andrew-Chen-Wang/patch-7\n\n" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/e2910a322216fc8f15e0eaaf806805d6b744a8c2", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188" - }, - { - "sha": "c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3" - } - ] - }, - { - "sha": "21c56bb97a59d69e71fcaebdde6d7715d25a9150", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MjFjNTZiYjk3YTU5ZDY5ZTcxZmNhZWJkZGU2ZDc3MTVkMjVhOTE1MA==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-24T16:38:29Z" - }, - "committer": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-24T16:38:29Z" - }, - "message": "Don't include base requirements with dot in front\n\nSee https://github.com/pyupio/pyup/issues/390", - "tree": { - "sha": "9b1624d69fc4b22a0ad40e1e245b62f5b1b44595", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9b1624d69fc4b22a0ad40e1e245b62f5b1b44595" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150", - "comment_count": 0, - "verification": { - "verified": false, - "reason": "unsigned", - "signature": null, - "payload": null - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/21c56bb97a59d69e71fcaebdde6d7715d25a9150", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188" - } - ] - }, - { - "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188", - "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6M2RlZGQ0ZGQ0YjU1MjU0YTBmZTZlZjI3MmM3MGMwYTU0YzVlNTE4OA==", - "commit": { - "author": { - "name": "Bruno Alla", - "email": "browniebroke@users.noreply.github.com", - "date": "2020-07-24T16:26:54Z" - }, - "committer": { - "name": "GitHub", - "email": "noreply@github.com", - "date": "2020-07-24T16:26:54Z" - }, - "message": "Merge pull request #2698 from pydanny/pyup-update-uvicorn-0.11.5-to-0.11.6\n\nUpdate uvicorn from 0.11.5 to 0.11.6", - "tree": { - "sha": "0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab" - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188", - "comment_count": 0, - "verification": { - "verified": true, - "reason": "valid", - "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGwvOCRBK7hj4Ov3rIwAAdHIIAA3/T2wR/VruzNEB2BJlr9+z\nZAAT0KmPkSyHd1BHdp7RaDB5XbRIrBfUHJgI9L6mRZEd1dZFQH5vitUrmLKFLLmn\nqbuAVjRzmzPwOChXmYRH0pDHJfdYvCqMkmD6ydhX56EL8+vuiYsNDDSviQygehX8\nBze3tGTk9wZwbN4hQSixREuTFiOhGF08ZgDxVjm9LvC6wKe+CXlbNGrTNYe+2AKO\ntU+RvCbfywMV264c+y9c4W4Z5Pwlk0u3mcjNevha/tyyNDk6MApvZ0see0BssAYG\n0M9f4prMOFkXUJs9wzw/r59DyvY3nhm3ovZ4pNmjqmsy1Tg5tuADbVXDEt7daw0=\n=fTep\n-----END PGP SIGNATURE-----\n", - "payload": "tree 0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab\nparent cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033\nparent 349f7e1141c4d1461802220ce7de4aaba0862cc5\nauthor Bruno Alla 1595608014 +0100\ncommitter GitHub 1595608014 +0100\n\nMerge pull request #2698 from pydanny/pyup-update-uvicorn-0.11.5-to-0.11.6\n\nUpdate uvicorn from 0.11.5 to 0.11.6" - } - }, - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188", - "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188/comments", - "author": { - "login": "browniebroke", - "id": 861044, - "node_id": "MDQ6VXNlcjg2MTA0NA==", - "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/browniebroke", - "html_url": "https://github.com/browniebroke", - "followers_url": "https://api.github.com/users/browniebroke/followers", - "following_url": "https://api.github.com/users/browniebroke/following{/other_user}", - "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}", - "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions", - "organizations_url": "https://api.github.com/users/browniebroke/orgs", - "repos_url": "https://api.github.com/users/browniebroke/repos", - "events_url": "https://api.github.com/users/browniebroke/events{/privacy}", - "received_events_url": "https://api.github.com/users/browniebroke/received_events", - "type": "User", - "site_admin": false - }, - "committer": { - "login": "web-flow", - "id": 19864447, - "node_id": "MDQ6VXNlcjE5ODY0NDQ3", - "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4", - "gravatar_id": "", - "url": "https://api.github.com/users/web-flow", - "html_url": "https://github.com/web-flow", - "followers_url": "https://api.github.com/users/web-flow/followers", - "following_url": "https://api.github.com/users/web-flow/following{/other_user}", - "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}", - "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}", - "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions", - "organizations_url": "https://api.github.com/users/web-flow/orgs", - "repos_url": "https://api.github.com/users/web-flow/repos", - "events_url": "https://api.github.com/users/web-flow/events{/privacy}", - "received_events_url": "https://api.github.com/users/web-flow/received_events", - "type": "User", - "site_admin": false - }, - "parents": [ - { - "sha": "cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033" - }, - { - "sha": "349f7e1141c4d1461802220ce7de4aaba0862cc5", - "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/349f7e1141c4d1461802220ce7de4aaba0862cc5", - "html_url": "https://github.com/pydanny/cookiecutter-django/commit/349f7e1141c4d1461802220ce7de4aaba0862cc5" - } - ] - } -] diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index a6c0e9c4..f9553257 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -28,4 +28,4 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v4 with: commit_message: Update Contributors - file_pattern: CONTRIBUTORS.md + file_pattern: CONTRIBUTORS.md .github/contributors.json diff --git a/scripts/rst_to_json.py b/scripts/rst_to_json.py index 1cb3f585..8c41c3a9 100644 --- a/scripts/rst_to_json.py +++ b/scripts/rst_to_json.py @@ -93,10 +93,7 @@ def main(): profiles_list.append(profile) output_file_path = ROOT / ".github" / "contributors.json" - output_file_path.write_text( - json.dumps(profiles_list, indent=2, ensure_ascii=False) - ) - + output_file_path.write_text(json.dumps(profiles_list, indent=2, ensure_ascii=False)) if __name__ == "__main__": diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 88b6ffa8..74875668 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -71,11 +71,14 @@ guidance and advice. def main() -> None: gh = GitHub() recent_authors = set(gh.iter_recent_authors()) + contrib_file = ContributorsJSONFile() for username in recent_authors: + print(f"Checking if {username} should be added") if username not in contrib_file and username not in BOT_LOGINS: user_data = gh.fetch_user_info(username) contrib_file.add_contributor(user_data) + print(f"Added {username} to contributors") contrib_file.save() write_md_file(contrib_file.content) From dbfcab2e12490497212f8ac1b87fbcf26396d8dd Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:18:09 +0100 Subject: [PATCH 112/389] Case insensitive sort for other contributors --- scripts/update_contributors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 74875668..cc22f33c 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -133,7 +133,7 @@ def write_md_file(contributors): template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True) core_contributors = [c for c in contributors if c.get("is_core", False)] other_contributors = (c for c in contributors if not c.get("is_core", False)) - other_contributors = sorted(other_contributors, key=lambda c: c["name"]) + other_contributors = sorted(other_contributors, key=lambda c: c["name"].lower()) content = template.render( core_contributors=core_contributors, other_contributors=other_contributors ) From 5c77042b590742c6546bc5ac9737c90902ce8259 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:30:21 +0100 Subject: [PATCH 113/389] Remove rst file and script to migrate --- CONTRIBUTORS.rst | 424 ----------------------------------------- scripts/rst_to_json.py | 100 ---------- 2 files changed, 524 deletions(-) delete mode 100644 CONTRIBUTORS.rst delete mode 100644 scripts/rst_to_json.py diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst deleted file mode 100644 index c564dfaf..00000000 --- a/CONTRIBUTORS.rst +++ /dev/null @@ -1,424 +0,0 @@ -Contributors -============ - -Core Developers ---------------- - -These contributors have commit flags for the repository, -and are able to accept and merge pull requests. - -=========================== ================= =========== -Name Github Twitter -=========================== ================= =========== -Daniel Roy Greenfeld `@pydanny`_ @pydanny -Audrey Roy Greenfeld* `@audreyr`_ @audreyr -Fábio C. Barrionuevo da Luz `@luzfcb`_ @luzfcb -Saurabh Kumar `@theskumar`_ @_theskumar -Jannis Gebauer `@jayfk`_ -Burhan Khalid `@burhan`_ @burhan -Nikita Shupeyko `@webyneter`_ @webyneter -Bruno Alla `@browniebroke`_ @_BrunoAlla -Wan Liuyang `@sfdye`_ @sfdye -=========================== ================= =========== - -*Audrey is also the creator of Cookiecutter. Audrey and -Daniel are on the Cookiecutter core team.* - -.. _@pydanny: https://github.com/pydanny -.. _@luzfcb: https://github.com/luzfcb -.. _@theskumar: https://github.com/theskumar -.. _@audreyr: https://github.com/audreyr -.. _@jayfk: https://github.com/jayfk -.. _@burhan: https://github.com/burhan -.. _@webyneter: https://github.com/webyneter -.. _@browniebroke: https://github.com/browniebroke -.. _@sfdye: https://github.com/sfdye - -Other Contributors ------------------- - -Listed in alphabetical order. - -========================== ============================ ============== - Name Github Twitter -========================== ============================ ============== - 18 `@dezoito`_ - 2O4 `@2O4`_ - a7p `@a7p`_ - Aadith PM `@aadithpm`_ - Aaron Eikenberry `@aeikenberry`_ - Adam Bogdał `@bogdal`_ - Adam Dobrawy `@ad-m`_ - Adam Steele `@adammsteele`_ - Agam Dua - Agustín Scaramuzza `@scaramagus`_ @scaramagus - Alberto Sanchez `@alb3rto`_ - Alex Tsai `@caffodian`_ - Alvaro [Andor] `@andor-pierdelacabeza`_ - Amjith Ramanujam `@amjith`_ - Andreas Meistad `@ameistad`_ - Andres Gonzalez `@andresgz`_ - Andrew Mikhnevich `@zcho`_ - Andrew Chen Wang `@Andrew-Chen-Wang`_ - Andy Rose - Anna Callahan `@jazztpt`_ - Anna Sidwell `@takkaria`_ - Antonia Blair `@antoniablair`_ @antoniablairart - Anuj Bansal `@ahhda`_ - Arcuri Davide `@dadokkio`_ - Areski Belaid `@areski`_ - AsheKR `@ashekr`_ - Ashley Camba - Barclay Gauld `@yunti`_ - Bartek `@btknu`_ - Ben Lopatin - Ben Warren `@bwarren2`_ - Benjamin Abel - Bert de Miranda `@bertdemiranda`_ - Bo Lopker `@blopker`_ - Bo Peng `@BoPeng`_ - Bouke Haarsma - Brent Payne `@brentpayne`_ @brentpayne - Bruce Olivier `@bolivierjr`_ - Burhan Khalid            `@burhan`_                   @burhan - Caio Ariede `@caioariede`_ @caioariede - Carl Johnson `@carlmjohnson`_ @carlmjohnson - Catherine Devlin `@catherinedevlin`_ - Cédric Gaspoz `@cgaspoz`_ - Charlie Smith `@chuckus`_ - Chris Curvey `@ccurvey`_ - Chris Franklin - Chris Franklin `@hairychris`_ - Chris Pappalardo `@ChrisPappalardo`_ - Christopher Clarke `@chrisdev`_ - Cole Mackenzie `@cmackenzie1`_ - Cole Maclean `@cole`_ @cole - Collederas `@Collederas`_ - Craig Margieson `@cmargieson`_ - Cristian Vargas `@cdvv7788`_ - Cullen Rhodes `@c-rhodes`_ - Curtis St Pierre `@curtisstpierre`_ @cstpierre1388 - Dan Shultz `@shultz`_ - Dani Hodovic `@danihodovic`_ - Daniel Hepper `@dhepper`_ @danielhepper - Daniel Hillier `@danifus`_ - Daniel Sears `@highpost`_ @highpost - Daniele Tricoli `@eriol`_ - David Díaz `@ddiazpinto`_ @DavidDiazPinto - Davit Tovmasyan `@davitovmasyan`_ - Davur Clementsen `@dsclementsen`_ @davur - Delio Castillo `@jangeador`_ @jangeador - Demetris Stavrou `@demestav`_ - Denis Bobrov `@delneg`_ - Denis Orehovsky `@apirobot`_ - Denis Savran `@blaxpy`_ - Diane Chen `@purplediane`_ @purplediane88 - Dónal Adams `@epileptic-fish`_ - Dong Huynh `@trungdong`_ - Duda Nogueira `@dudanogueira`_ @dudanogueira - Emanuel Calso `@bloodpet`_ @bloodpet - Eraldo Energy `@eraldo`_ - Eric Groom `@ericgroom`_ - Ernesto Cedeno `@codnee`_ - Eyad Al Sibai `@eyadsibai`_ - Felipe Arruda `@arruda`_ - Florian Idelberger `@step21`_ @windrush - Gabriel Mejia `@elgartoinf`_ @elgartoinf - Garry Cairns `@garry-cairns`_ - Garry Polley `@garrypolley`_ - Gilbishkosma `@Gilbishkosma`_ - Glenn Wiskur `@gwiskur`_ - Guilherme Guy `@guilherme1guy`_ - Hamish Durkin `@durkode`_ - Hana Quadara `@hanaquadara`_ - Hannah Lazarus `@hanhanhan`_ - Harry Moreno `@morenoh149`_ @morenoh149 - Harry Percival `@hjwp`_ - Hendrik Schneider `@hendrikschneider`_ - Henrique G. G. Pereira `@ikkebr`_ - Howie Zhao `@howiezhao`_ - Ian Lee `@IanLee1521`_ - Irfan Ahmad `@erfaan`_ @erfaan - Isaac12x `@Isaac12x`_ - Ivan Khomutov `@ikhomutov`_ - James Williams `@jameswilliams1`_ - Jan Van Bruggen `@jvanbrug`_ - Jelmer Draaijer `@foarsitter`_ - Jerome Caisip `@jeromecaisip`_ - Jens Nilsson `@phiberjenz`_ - Jerome Leclanche `@jleclanche`_ @Adys - Jimmy Gitonga `@afrowave`_ @afrowave - John Cass `@jcass77`_ @cass_john - Jonathan Thompson `@nojanath`_ - Jules Cheron `@jules-ch`_ - Julien Almarcha `@sladinji`_ - Julio Castillo `@juliocc`_ - Kaido Kert `@kaidokert`_ - kappataumu `@kappataumu`_ @kappataumu - Kaveh `@ka7eh`_ - Keith Bailey `@keithjeb`_ - Keith Webber `@townie`_ - Kevin A. Stone - Kevin Ndung'u `@kevgathuku`_ - Keyvan Mosharraf `@keyvanm`_ - Krzysztof Szumny `@noisy`_ - Krzysztof Żuraw `@krzysztofzuraw`_ - Leo won `@leollon`_ - Leo Zhou `@glasslion`_ - Leon Kim `@PilhwanKim`_ - Leonardo Jimenez `@xpostudio4`_ - Lin Xianyi `@iynaix`_ - Luis Nell `@originell`_ - Lukas Klein - Lyla Fischer - Malik Sulaimanov `@flyudvik`_ @flyudvik - Martin Blech - Martin Saizar `@msaizar`_ - Mateusz Ostaszewski `@mostaszewski`_ - Mathijs Hoogland `@MathijsHoogland`_ - Matt Braymer-Hayes `@mattayes`_ @mattayes - Matt Knapper `@mknapper1`_ - Matt Linares - Matt Menzenski `@menzenski`_ - Matt Warren `@mfwarren`_ - Matthew Sisley `@mjsisley`_ - Matthias Sieber `@manonthemat`_ @MatzeOne - Meghan Heintz `@dot2dotseurat`_ - Mesut Yılmaz `@myilmaz`_ - Michael Gecht `@mimischi`_ @_mischi - Michael Samoylov `@msamoylov`_ - Min ho Kim `@minho42`_ - mozillazg `@mozillazg`_ - Nico Stefani `@nicolas471`_ @moby_dick91 - Oleg Russkin `@rolep`_ - Pablo `@oubiga`_ - Parbhat Puri `@parbhat`_ - Pawan Chaurasia `@rjsnh1522`_ - Peter Bittner `@bittner`_ - Peter Coles `@mrcoles`_ - Philipp Matthies `@canonnervio`_ - Pierre Chiquet `@pchiquet`_ - Raony Guimarães Corrêa `@raonyguimaraes`_ - Raphael Pierzina `@hackebrot`_ - Reggie Riser `@reggieriser`_ - René Muhl `@rm--`_ - Richard Hajdu `@Tusky`_ - Roman Afanaskin `@siauPatrick`_ - Roman Osipenko `@romanosipenko`_ - Russell Davies - Sam Collins `@MightySCollins`_ - Sascha `@saschalalala`_ @saschalalala - Shupeyko Nikita `@webyneter`_ - Sławek Ehlert `@slafs`_ - Sorasful `@sorasful`_ - Srinivas Nyayapati `@shireenrao`_ - stepmr `@stepmr`_ - Steve Steiner `@ssteinerX`_ - Sudarshan Wadkar `@wadkar`_ - Sule Marshall `@suledev`_ - Tano Abeleyra `@tanoabeleyra`_ - Taylor Baldwin - Théo Segonds `@show0k`_ - Tim Claessens `@timclaessens`_ - Tim Freund `@timfreund`_ - Tom Atkins `@knitatoms`_ - Tom Offermann - Travis McNeill `@Travistock`_ @tavistock_esq - Tubo Shi `@Tubo`_ - Umair Ashraf `@umrashrf`_ @fabumair - Vadim Iskuchekov `@Egregors`_ @egregors - Vicente G. Reyes `@reyesvicente`_ @highcenburg - Vitaly Babiy - Vivian Guillen `@viviangb`_ - Vlad Doster `@vladdoster`_ - Will Farley `@goldhand`_ @g01dhand - William Archinal `@archinal`_ - Xaver Y.R. Chen `@yrchen`_ @yrchen - Yaroslav Halchenko - Yuchen Xie `@mapx`_ -========================== ============================ ============== - -.. _@aadithpm: https://github.com/aadithpm -.. _@a7p: https://github.com/a7p -.. _@2O4: https://github.com/2O4 -.. _@ad-m: https://github.com/ad-m -.. _@adammsteele: https://github.com/adammsteele -.. _@aeikenberry: https://github.com/aeikenberry -.. _@afrowave: https://github.com/afrowave -.. _@ahhda: https://github.com/ahhda -.. _@alb3rto: https://github.com/alb3rto -.. _@ameistad: https://github.com/ameistad -.. _@amjith: https://github.com/amjith -.. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza -.. _@andresgz: https://github.com/andresgz -.. _@antoniablair: https://github.com/antoniablair -.. _@Andrew-Chen-Wang: https://github.com/Andrew-Chen-Wang -.. _@apirobot: https://github.com/apirobot -.. _@archinal: https://github.com/archinal -.. _@areski: https://github.com/areski -.. _@arruda: https://github.com/arruda -.. _@ashekr: https://github.com/ashekr -.. _@bertdemiranda: https://github.com/bertdemiranda -.. _@bittner: https://github.com/bittner -.. _@blaxpy: https://github.com/blaxpy -.. _@bloodpet: https://github.com/bloodpet -.. _@blopker: https://github.com/blopker -.. _@bogdal: https://github.com/bogdal -.. _@bolivierjr: https://github.com/bolivierjr -.. _@BoPeng: https://github.com/BoPeng -.. _@brentpayne: https://github.com/brentpayne -.. _@btknu: https://github.com/btknu -.. _@bwarren2: https://github.com/bwarren2 -.. _@c-rhodes: https://github.com/c-rhodes -.. _@caffodian: https://github.com/caffodian -.. _@canonnervio: https://github.com/canonnervio -.. _@caioariede: https://github.com/caioariede -.. _@carlmjohnson: https://github.com/carlmjohnson -.. _@catherinedevlin: https://github.com/catherinedevlin -.. _@ccurvey: https://github.com/ccurvey -.. _@cdvv7788: https://github.com/cdvv7788 -.. _@cgaspoz: https://github.com/cgaspoz -.. _@chrisdev: https://github.com/chrisdev -.. _@ChrisPappalardo: https://github.com/ChrisPappalardo -.. _@chuckus: https://github.com/chuckus -.. _@cmackenzie1: https://github.com/cmackenzie1 -.. _@cmargieson: https://github.com/cmargieson -.. _@codnee: https://github.com/codnee -.. _@cole: https://github.com/cole -.. _@Collederas: https://github.com/Collederas -.. _@curtisstpierre: https://github.com/curtisstpierre -.. _@dadokkio: https://github.com/dadokkio -.. _@danihodovic: https://github.com/danihodovic -.. _@danifus: https://github.com/danifus -.. _@davitovmasyan: https://github.com/davitovmasyan -.. _@ddiazpinto: https://github.com/ddiazpinto -.. _@delneg: https://github.com/delneg -.. _@demestav: https://github.com/demestav -.. _@dezoito: https://github.com/dezoito -.. _@dhepper: https://github.com/dhepper -.. _@dot2dotseurat: https://github.com/dot2dotseurat -.. _@dudanogueira: https://github.com/dudanogueira -.. _@dsclementsen: https://github.com/dsclementsen -.. _@guilherme1guy: https://github.com/guilherme1guy -.. _@durkode: https://github.com/durkode -.. _@Egregors: https://github.com/Egregors -.. _@elgartoinf: https://gihub.com/elgartoinf -.. _@epileptic-fish: https://gihub.com/epileptic-fish -.. _@eraldo: https://github.com/eraldo -.. _@erfaan: https://github.com/erfaan -.. _@ericgroom: https://github.com/ericgroom -.. _@eriol: https://github.com/eriol -.. _@eyadsibai: https://github.com/eyadsibai -.. _@flyudvik: https://github.com/flyudvik -.. _@foarsitter: https://github.com/foarsitter -.. _@garry-cairns: https://github.com/garry-cairns -.. _@garrypolley: https://github.com/garrypolley -.. _@Gilbishkosma: https://github.com/Gilbishkosma -.. _@gwiskur: https://github.com/gwiskur -.. _@glasslion: https://github.com/glasslion -.. _@goldhand: https://github.com/goldhand -.. _@hackebrot: https://github.com/hackebrot -.. _@hairychris: https://github.com/hairychris -.. _@hanaquadara: https://github.com/hanaquadara -.. _@hanhanhan: https://github.com/hanhanhan -.. _@hendrikschneider: https://github.com/hendrikschneider -.. _@highpost: https://github.com/highpost -.. _@hjwp: https://github.com/hjwp -.. _@howiezhao: https://github.com/howiezhao -.. _@IanLee1521: https://github.com/IanLee1521 -.. _@ikhomutov: https://github.com/ikhomutov -.. _@jameswilliams1: https://github.com/jameswilliams1 -.. _@ikkebr: https://github.com/ikkebr -.. _@Isaac12x: https://github.com/Isaac12x -.. _@iynaix: https://github.com/iynaix -.. _@jangeador: https://github.com/jangeador -.. _@jazztpt: https://github.com/jazztpt -.. _@jcass77: https://github.com/jcass77 -.. _@jeromecaisip: https://github.com/jeromecaisip -.. _@jleclanche: https://github.com/jleclanche -.. _@jules-ch: https://github.com/jules-ch -.. _@juliocc: https://github.com/juliocc -.. _@jvanbrug: https://github.com/jvanbrug -.. _@ka7eh: https://github.com/ka7eh -.. _@kaidokert: https://github.com/kaidokert -.. _@kappataumu: https://github.com/kappataumu -.. _@keithjeb: https://github.com/keithjeb -.. _@kevgathuku: https://github.com/kevgathuku -.. _@keyvanm: https://github.com/keyvanm -.. _@knitatoms: https://github.com/knitatoms -.. _@krzysztofzuraw: https://github.com/krzysztofzuraw -.. _@leollon: https://github.com/leollon -.. _@MathijsHoogland: https://github.com/MathijsHoogland -.. _@mapx: https://github.com/mapx -.. _@manonthemat: https://github.com/manonthemat -.. _@mattayes: https://github.com/mattayes -.. _@menzenski: https://github.com/menzenski -.. _@mfwarren: https://github.com/mfwarren -.. _@MightySCollins: https://github.com/MightySCollins -.. _@mimischi: https://github.com/mimischi -.. _@minho42: https://github.com/minho42 -.. _@mjsisley: https://github.com/mjsisley -.. _@mknapper1: https://github.com/mknapper1 -.. _@morenoh149: https://github.com/morenoh149 -.. _@mostaszewski: https://github.com/mostaszewski -.. _@mozillazg: https://github.com/mozillazg -.. _@mrcoles: https://github.com/mrcoles -.. _@msaizar: https://github.com/msaizar -.. _@msamoylov: https://github.com/msamoylov -.. _@myilmaz: https://github.com/myilmaz -.. _@nicolas471: https://github.com/nicolas471 -.. _@noisy: https://github.com/noisy -.. _@nojanath: https://github.com/nojanath -.. _@originell: https://github.com/originell -.. _@oubiga: https://github.com/oubiga -.. _@parbhat: https://github.com/parbhat -.. _@rjsnh1522: https://github.com/rjsnh1522 -.. _@pchiquet: https://github.com/pchiquet -.. _@phiberjenz: https://github.com/phiberjenz -.. _@PilhwanKim: https://github.com/PilhwanKim -.. _@purplediane: https://github.com/purplediane -.. _@raonyguimaraes: https://github.com/raonyguimaraes -.. _@reggieriser: https://github.com/reggieriser -.. _@reyesvicente: https://github.com/reyesvicente -.. _@rm--: https://github.com/rm-- -.. _@Tusky: https://github.com/Tusky -.. _@rolep: https://github.com/rolep -.. _@romanosipenko: https://github.com/romanosipenko -.. _@saschalalala: https://github.com/saschalalala -.. _@scaramagus: https://github.com/scaramagus -.. _@shireenrao: https://github.com/shireenrao -.. _@show0k: https://github.com/show0k -.. _@shultz: https://github.com/shultz -.. _@siauPatrick: https://github.com/siauPatrick -.. _@sladinji: https://github.com/sladinji -.. _@slafs: https://github.com/slafs -.. _@sorasful:: https://github.com/sorasful -.. _@ssteinerX: https://github.com/ssteinerx -.. _@step21: https://github.com/step21 -.. _@stepmr: https://github.com/stepmr -.. _@suledev: https://github.com/suledev -.. _@takkaria: https://github.com/takkaria -.. _@tanoabeleyra: https://github.com/tanoabeleyra -.. _@timclaessens: https://github.com/timclaessens -.. _@timfreund: https://github.com/timfreund -.. _@townie: https://github.com/townie -.. _@Travistock: https://github.com/Tavistock -.. _@trungdong: https://github.com/trungdong -.. _@Tubo: https://github.com/tubo -.. _@umrashrf: https://github.com/umrashrf -.. _@viviangb: https://github.com/viviangb -.. _@vladdoster: https://github.com/vladdoster -.. _@wadkar: https://github.com/wadkar -.. _@xpostudio4: https://github.com/xpostudio4 -.. _@yrchen: https://github.com/yrchen -.. _@yunti: https://github.com/yunti -.. _@zcho: https://github.com/zcho - -Special Thanks -~~~~~~~~~~~~~~ - -The following haven't provided code directly, but have provided guidance and advice. - -* Jannis Leidel -* Nate Aune -* Barry Morrison diff --git a/scripts/rst_to_json.py b/scripts/rst_to_json.py deleted file mode 100644 index 8c41c3a9..00000000 --- a/scripts/rst_to_json.py +++ /dev/null @@ -1,100 +0,0 @@ -import json -from pathlib import Path - -CURRENT_FILE = Path(__file__) -ROOT = CURRENT_FILE.parents[1] - - -def main(): - input_file_path = ROOT / "CONTRIBUTORS.rst" - content = input_file_path.read_text() - - table_separator = ( - "========================== ============================ ==============" - ) - table_content = content.split(table_separator)[2] - - profiles_list = [ - { - "name": "Daniel Roy Greenfeld", - "github_login": "pydanny", - "twitter_username": "pydanny", - "is_core": True, - }, - { - "name": "Audrey Roy Greenfeld", - "github_login": "audreyr", - "twitter_username": "audreyr", - "is_core": True, - }, - { - "name": "Fábio C. Barrionuevo da Luz", - "github_login": "luzfcb", - "twitter_username": "luzfcb", - "is_core": True, - }, - { - "name": "Saurabh Kumar", - "github_login": "theskumar", - "twitter_username": "_theskumar", - "is_core": True, - }, - { - "name": "Jannis Gebauer", - "github_login": "jayfk", - "twitter_username": "", - "is_core": True, - }, - { - "name": "Burhan Khalid", - "github_login": "burhan", - "twitter_username": "burhan", - "is_core": True, - }, - { - "name": "Shupeyko Nikita", - "github_login": "webyneter", - "twitter_username": "webyneter", - "is_core": True, - }, - { - "name": "Bruno Alla", - "github_login": "browniebroke", - "twitter_username": "_BrunoAlla", - "is_core": True, - }, - { - "name": "Wan Liuyang", - "github_login": "sfdye", - "twitter_username": "sfdye", - "is_core": True, - }, - ] - core_members = [member["github_login"] for member in profiles_list] - - for contrib in table_content.split("\n"): - if not contrib: - continue - line_parts = contrib.split("`") - name = line_parts[0].strip() - github_login = line_parts[1].lstrip("@") if len(line_parts) > 1 else "" - if github_login in core_members: - continue - twitter_username = ( - line_parts[2].lstrip("_").strip().lstrip("@") - if len(line_parts) == 3 - else "" - ) - profile = { - "name": name, - "github_login": github_login, - "twitter_username": twitter_username, - } - profiles_list.append(profile) - - output_file_path = ROOT / ".github" / "contributors.json" - output_file_path.write_text(json.dumps(profiles_list, indent=2, ensure_ascii=False)) - - -if __name__ == "__main__": - main() From 333da12f51a09733c6fe172edea697e60984246d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:30:36 +0100 Subject: [PATCH 114/389] Add docstrings to the update_contributors.py file --- scripts/update_contributors.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index cc22f33c..0f157595 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -8,6 +8,7 @@ CURRENT_FILE = Path(__file__) ROOT = CURRENT_FILE.parents[1] BOT_LOGINS = ["pyup-bot"] +# Jinja template for CONTRIBUTORS.md CONTRIBUTORS_TEMPLATE = """ # Contributors @@ -69,9 +70,19 @@ guidance and advice. def main() -> None: + """ + Script entry point. + + 1. Fetch recent contribtors from the Github API + 2. Add missing ones to the JSON file + 3. Generate Markdown from JSON file + """ + # Use Github API to fetch recent authors rather than + # git CLI because we need to know their GH username gh = GitHub() recent_authors = set(gh.iter_recent_authors()) + # Add missing users to the JSON file contrib_file = ContributorsJSONFile() for username in recent_authors: print(f"Checking if {username} should be added") @@ -81,10 +92,13 @@ def main() -> None: print(f"Added {username} to contributors") contrib_file.save() + # Generate MD file from JSON file write_md_file(contrib_file.content) class GitHub: + """Small wrapper around Github REST API.""" + base_url = "https://api.github.com" def __init__(self) -> None: @@ -107,29 +121,36 @@ class GitHub: class ContributorsJSONFile: + """Helper to interact with the JSON file.""" + file_path = ROOT / ".github" / "contributors.json" content = None def __init__(self) -> None: + """Read initial content.""" self.content = json.loads(self.file_path.read_text()) def __contains__(self, github_login: str): + """Provide a nice API to do: `username in file`.""" return any(github_login == contrib["github_login"] for contrib in self.content) def add_contributor(self, user_data): + """Append the contributor data we care about at the end.""" contributor_data = { "name": user_data["name"], "github_login": user_data["login"], "twitter_username": user_data["twitter_username"], } - self.content.extend(contributor_data) + self.content.append(contributor_data) def save(self): + """Write the file to disk with indentation.""" text_content = json.dumps(self.content, indent=2, ensure_ascii=False) self.file_path.write_text(text_content) def write_md_file(contributors): + """Generate markdown file from Jinja template.""" template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True) core_contributors = [c for c in contributors if c.get("is_core", False)] other_contributors = (c for c in contributors if not c.get("is_core", False)) From c8c6951dd22bb0510b907b0f98292f259b6229e8 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:35:04 +0100 Subject: [PATCH 115/389] Move template outside of the python script --- .github/CONTRIBUTORS-template.md | 56 ++++++++++++++++++++++++++++ scripts/update_contributors.py | 63 +------------------------------- 2 files changed, 58 insertions(+), 61 deletions(-) create mode 100644 .github/CONTRIBUTORS-template.md diff --git a/.github/CONTRIBUTORS-template.md b/.github/CONTRIBUTORS-template.md new file mode 100644 index 00000000..d8ba28c6 --- /dev/null +++ b/.github/CONTRIBUTORS-template.md @@ -0,0 +1,56 @@ +# Contributors + +## Core Developers + +These contributors have commit flags for the repository, and are able to +accept and merge pull requests. + + + + + + + + {%- for contributor in core_contributors %} + + + + + + {%- endfor %} +
NameGithubTwitter
{{ contributor.name }} + {{ contributor.github_login }} + {{ contributor.twitter_username }}
+ +*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on +the Cookiecutter core team.* + +## Other Contributors + +Listed in alphabetical order. + + + + + + + + {%- for contributor in other_contributors %} + + + + + + {%- endfor %} +
NameGithubTwitter
{{ contributor.name }} + {{ contributor.github_login }} + {{ contributor.twitter_username }}
+ +### Special Thanks + +The following haven't provided code directly, but have provided +guidance and advice. + +- Jannis Leidel +- Nate Aune +- Barry Morrison diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 0f157595..8ad013d4 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -8,66 +8,6 @@ CURRENT_FILE = Path(__file__) ROOT = CURRENT_FILE.parents[1] BOT_LOGINS = ["pyup-bot"] -# Jinja template for CONTRIBUTORS.md -CONTRIBUTORS_TEMPLATE = """ -# Contributors - -## Core Developers - -These contributors have commit flags for the repository, and are able to -accept and merge pull requests. - - - - - - - - {%- for contributor in core_contributors %} - - - - - - {%- endfor %} -
NameGithubTwitter
{{ contributor.name }} - {{ contributor.github_login }} - {{ contributor.twitter_username }}
- -*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on -the Cookiecutter core team.* - -## Other Contributors - -Listed in alphabetical order. - - - - - - - - {%- for contributor in other_contributors %} - - - - - - {%- endfor %} -
NameGithubTwitter
{{ contributor.name }} - {{ contributor.github_login }} - {{ contributor.twitter_username }}
- -### Special Thanks - -The following haven't provided code directly, but have provided -guidance and advice. - -- Jannis Leidel -- Nate Aune -- Barry Morrison -""" - def main() -> None: """ @@ -151,7 +91,8 @@ class ContributorsJSONFile: def write_md_file(contributors): """Generate markdown file from Jinja template.""" - template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True) + contributors_template = ROOT / ".github" / "CONTRIBUTORS-template.md" + template = Template(contributors_template.read_text(), autoescape=True) core_contributors = [c for c in contributors if c.get("is_core", False)] other_contributors = (c for c in contributors if not c.get("is_core", False)) other_contributors = sorted(other_contributors, key=lambda c: c["name"].lower()) From 81bc4fb73d25dd4dd621b29140c79dedf70e6c32 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:35:18 +0100 Subject: [PATCH 116/389] Run black on our custom scripts --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 242183c3..cecc7435 100644 --- a/tox.ini +++ b/tox.ini @@ -8,4 +8,4 @@ commands = pytest {posargs:./tests} [testenv:black-template] deps = black -commands = black --check hooks tests setup.py docs +commands = black --check hooks tests setup.py docs scripts From 7570ed9c5a48b03512ce6a434fd21c78bfe72999 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:39:15 +0100 Subject: [PATCH 117/389] Bot usernames are excluded in the generator --- scripts/update_contributors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 8ad013d4..206d7aab 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -26,7 +26,7 @@ def main() -> None: contrib_file = ContributorsJSONFile() for username in recent_authors: print(f"Checking if {username} should be added") - if username not in contrib_file and username not in BOT_LOGINS: + if username not in contrib_file: user_data = gh.fetch_user_info(username) contrib_file.add_contributor(user_data) print(f"Added {username} to contributors") From 4e137c00edef917c7b0a0e0375aa94187f426f7b Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 10 Aug 2020 18:44:35 +0100 Subject: [PATCH 118/389] Update contributing guidelines and PR template --- .github/PULL_REQUEST_TEMPLATE.md | 8 ++------ CONTRIBUTING.rst | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8dbff6c2..45e67c69 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,8 +2,8 @@ [//]: # (Before you proceed:) -[//]: # (1. Make sure to add yourself to `CONTRIBUTORS.rst` through this PR provided you're contributing here for the first time) -[//]: # (2. Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing) +[//]: # (- 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 @@ -11,15 +11,11 @@ [//]: # (What's it you're proposing?) - - ## Rationale [//]: # (Why does the project need that?) - - ## Use case(s) / visualization(s) [//]: # ("Better to see something once than to hear about it a thousand times.") diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 0a64e628..5d88bf5b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -8,7 +8,6 @@ Getting your pull request merged in #. Keep it small. The smaller the pull request the more likely I'll pull it in. #. Pull requests that fix a current issue get priority for review. -#. If you're not already in the `CONTRIBUTORS.rst` file, add yourself! Testing ------- From 8287a87de36c7e071a8635fdbbb538c623fd5e7e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 10 Aug 2020 17:45:27 +0000 Subject: [PATCH 119/389] Update Contributors --- CONTRIBUTORS.md | 1445 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1445 insertions(+) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 00000000..d033b1d9 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,1445 @@ +# Contributors + +## Core Developers + +These contributors have commit flags for the repository, and are able to +accept and merge pull requests. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameGithubTwitter
Daniel Roy Greenfeld + pydanny + pydanny
Audrey Roy Greenfeld + audreyr + audreyr
Fábio C. Barrionuevo da Luz + luzfcb + luzfcb
Saurabh Kumar + theskumar + _theskumar
Jannis Gebauer + jayfk +
Burhan Khalid + burhan + burhan
Shupeyko Nikita + webyneter + webyneter
Bruno Alla + browniebroke + _BrunoAlla
Wan Liuyang + sfdye + sfdye
+ +*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on +the Cookiecutter core team.* + +## Other Contributors + +Listed in alphabetical order. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameGithubTwitter
18 + dezoito +
2O4 + 2O4 +
a7p + a7p +
Aadith PM + aadithpm +
Aaron Eikenberry + aeikenberry +
Adam Bogdał + bogdal +
Adam Dobrawy + ad-m +
Adam Steele + adammsteele +
Agam Dua + +
Agustín Scaramuzza + scaramagus + scaramagus
Alberto Sanchez + alb3rto +
Alex Tsai + caffodian +
Alvaro [Andor] + andor-pierdelacabeza +
Amjith Ramanujam + amjith +
Andreas Meistad + ameistad +
Andres Gonzalez + andresgz +
Andrew Chen Wang + Andrew-Chen-Wang +
Andrew Mikhnevich + zcho +
Andy Rose + +
Anna Callahan + jazztpt +
Anna Sidwell + takkaria +
Antonia Blair + antoniablair + antoniablairart
Anuj Bansal + ahhda +
Arcuri Davide + dadokkio +
Areski Belaid + areski +
AsheKR + ashekr +
Ashley Camba + +
Barclay Gauld + yunti +
Bartek + btknu +
Ben Lopatin + +
Ben Warren + bwarren2 +
Benjamin Abel + +
Bert de Miranda + bertdemiranda +
Bo Lopker + blopker +
Bo Peng + BoPeng +
Bouke Haarsma + +
Brent Payne + brentpayne + brentpayne
Bruce Olivier + bolivierjr +
Caio Ariede + caioariede + caioariede
Carl Johnson + carlmjohnson + carlmjohnson
Catherine Devlin + catherinedevlin +
Charlie Smith + chuckus +
Chris Curvey + ccurvey +
Chris Franklin + +
Chris Franklin + hairychris +
Chris Pappalardo + ChrisPappalardo +
Christopher Clarke + chrisdev +
Cole Mackenzie + cmackenzie1 +
Cole Maclean + cole + cole
Collederas + Collederas +
Craig Margieson + cmargieson +
Cristian Vargas + cdvv7788 +
Cullen Rhodes + c-rhodes +
Curtis St Pierre + curtisstpierre + cstpierre1388
Cédric Gaspoz + cgaspoz +
Dan Shultz + shultz +
Dani Hodovic + danihodovic +
Daniel Hepper + dhepper + danielhepper
Daniel Hillier + danifus +
Daniel Sears + highpost + highpost
Daniele Tricoli + eriol +
David Díaz + ddiazpinto + DavidDiazPinto
Davit Tovmasyan + davitovmasyan +
Davur Clementsen + dsclementsen + davur
Delio Castillo + jangeador + jangeador
Demetris Stavrou + demestav +
Denis Bobrov + delneg +
Denis Orehovsky + apirobot +
Denis Savran + blaxpy +
Diane Chen + purplediane + purplediane88
Dong Huynh + trungdong +
Duda Nogueira + dudanogueira + dudanogueira
Dónal Adams + epileptic-fish +
Emanuel Calso + bloodpet + bloodpet
Eraldo Energy + eraldo +
Eric Groom + ericgroom +
Ernesto Cedeno + codnee +
Eyad Al Sibai + eyadsibai +
Felipe Arruda + arruda +
Florian Idelberger + step21 + windrush
Gabriel Mejia + elgartoinf + elgartoinf
Garry Cairns + garry-cairns +
Garry Polley + garrypolley +
Gilbishkosma + Gilbishkosma +
Glenn Wiskur + gwiskur +
Guilherme Guy + guilherme1guy +
Hamish Durkin + durkode +
Hana Quadara + hanaquadara +
Hannah Lazarus + hanhanhan +
Harry Moreno + morenoh149 + morenoh149
Harry Percival + hjwp +
Hendrik Schneider + hendrikschneider +
Henrique G. G. Pereira + ikkebr +
Howie Zhao + howiezhao +
Ian Lee + IanLee1521 +
Irfan Ahmad + erfaan + erfaan
Isaac12x + Isaac12x +
Ivan Khomutov + ikhomutov +
James Williams + jameswilliams1 +
Jan Van Bruggen + jvanbrug +
Jelmer Draaijer + foarsitter +
Jens Nilsson + phiberjenz +
Jerome Caisip + jeromecaisip +
Jerome Leclanche + jleclanche + Adys
Jimmy Gitonga + afrowave + afrowave
John Cass + jcass77 + cass_john
Jonathan Thompson + nojanath +
Jules Cheron + jules-ch +
Julien Almarcha + sladinji +
Julio Castillo + juliocc +
Kaido Kert + kaidokert +
kappataumu + kappataumu + kappataumu
Kaveh + ka7eh +
Keith Bailey + keithjeb +
Keith Webber + townie +
Kevin A. Stone + +
Kevin Ndung'u + kevgathuku +
Keyvan Mosharraf + keyvanm +
Krzysztof Szumny + noisy +
Krzysztof Żuraw + krzysztofzuraw +
Leo won + leollon +
Leo Zhou + glasslion +
Leon Kim + PilhwanKim +
Leonardo Jimenez + xpostudio4 +
Lin Xianyi + iynaix +
Luis Nell + originell +
Lukas Klein + +
Lyla Fischer + +
Malik Sulaimanov + flyudvik + flyudvik
Martin Blech + +
Martin Saizar + msaizar +
Mateusz Ostaszewski + mostaszewski +
Mathijs Hoogland + MathijsHoogland +
Matt Braymer-Hayes + mattayes + mattayes
Matt Knapper + mknapper1 +
Matt Linares + +
Matt Menzenski + menzenski +
Matt Warren + mfwarren +
Matthew Sisley + mjsisley +
Matthias Sieber + manonthemat + MatzeOne
Meghan Heintz + dot2dotseurat +
Mesut Yılmaz + myilmaz +
Michael Gecht + mimischi + _mischi
Michael Samoylov + msamoylov +
Min ho Kim + minho42 +
mozillazg + mozillazg +
Nico Stefani + nicolas471 + moby_dick91
Oleg Russkin + rolep +
Pablo + oubiga +
Parbhat Puri + parbhat +
Pawan Chaurasia + rjsnh1522 +
Peter Bittner + bittner +
Peter Coles + mrcoles +
Philipp Matthies + canonnervio +
Pierre Chiquet + pchiquet +
Raony Guimarães Corrêa + raonyguimaraes +
Raphael Pierzina + hackebrot +
Reggie Riser + reggieriser +
René Muhl + rm-- +
Richard Hajdu + Tusky +
Roman Afanaskin + siauPatrick +
Roman Osipenko + romanosipenko +
Russell Davies + +
Sam Collins + MightySCollins +
Sascha + saschalalala + saschalalala
Sorasful + sorasful +
Srinivas Nyayapati + shireenrao +
stepmr + stepmr +
Steve Steiner + ssteinerX +
Sudarshan Wadkar + wadkar +
Sule Marshall + suledev +
Sławek Ehlert + slafs +
Tano Abeleyra + tanoabeleyra +
Taylor Baldwin + +
Théo Segonds + show0k +
Tim Claessens + timclaessens +
Tim Freund + timfreund +
Tom Atkins + knitatoms +
Tom Offermann + +
Travis McNeill + Travistock + tavistock_esq
Tubo Shi + Tubo +
Umair Ashraf + umrashrf + fabumair
Vadim Iskuchekov + Egregors + egregors
Vicente G. Reyes + reyesvicente + highcenburg
Vitaly Babiy + +
Vivian Guillen + viviangb +
Vlad Doster + vladdoster +
Will Farley + goldhand + g01dhand
William Archinal + archinal +
Xaver Y.R. Chen + yrchen + yrchen
Yaroslav Halchenko + +
Yuchen Xie + mapx +
+ +### Special Thanks + +The following haven't provided code directly, but have provided +guidance and advice. + +- Jannis Leidel +- Nate Aune +- Barry Morrison \ No newline at end of file From 0c8cfc65aa9c6a25cd15527b2c8ca4a5e9b15822 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 11 Aug 2020 01:42:06 -0700 Subject: [PATCH 120/389] Update flake8-isort from 3.0.1 to 4.0.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1fbc8d16..fd88434d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==19.10b0 isort==4.3.21 flake8==3.8.3 -flake8-isort==3.0.1 +flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ From 85cfe02437fa094b779193260a87ee372f88fd06 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 11 Aug 2020 01:42:07 -0700 Subject: [PATCH 121/389] Update flake8-isort from 3.0.1 to 4.0.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 028b36a9..6b6f00e9 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -26,7 +26,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ flake8==3.8.3 # https://github.com/PyCQA/flake8 -flake8-isort==3.0.1 # https://github.com/gforcada/flake8-isort +flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.2.1 # https://github.com/nedbat/coveragepy black==19.10b0 # https://github.com/ambv/black pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django From 1cc6e6a05cddf7d3d703a7cf10fd3888c8006746 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 11 Aug 2020 02:42:42 -0700 Subject: [PATCH 122/389] Update isort from 4.3.21 to 5.3.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fd88434d..17cebc3c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==19.10b0 -isort==4.3.21 +isort==5.3.2 flake8==3.8.3 flake8-isort==4.0.0 From 97e18889c68b55326fbf11685ebc7d239ac7ed72 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 11 Aug 2020 16:05:14 +0100 Subject: [PATCH 123/389] Revert "Added name to CONTRIBUTORS.txt" This reverts commit 160ed6cb --- {{cookiecutter.project_slug}}/CONTRIBUTORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt index e8450c4c..82a80bfc 100644 --- a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt +++ b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt @@ -1 +1 @@ -enchance \ No newline at end of file +{{ cookiecutter.author_name }} From 1645b8826d49a8bd57c8843bc8e78df0708163d3 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 11 Aug 2020 16:20:10 +0100 Subject: [PATCH 124/389] Use the pip resolver to avoid broken deps --- tests/test_bare.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_bare.sh b/tests/test_bare.sh index 7021a7e4..28f9b7bf 100755 --- a/tests/test_bare.sh +++ b/tests/test_bare.sh @@ -5,6 +5,10 @@ set -o errexit +# Install modern pip to use new resolver: +# https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html +pip install 'pip>=20.2' + # install test requirements pip install -r requirements.txt @@ -20,7 +24,7 @@ cd my_awesome_project sudo utility/install_os_dependencies.sh install # Install Python deps -pip install -r requirements/local.txt +pip install --use-feature=2020-resolver -r requirements/local.txt # run the project's tests pytest From 85a5e46b9269f37172e7a04ad26a3ffcbd32dd69 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 11 Aug 2020 16:51:34 +0100 Subject: [PATCH 125/389] Find recent authors based on merged pull requests --- scripts/update_contributors.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 206d7aab..c7337764 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -1,5 +1,6 @@ import json from pathlib import Path +from urllib.parse import urlencode import requests from jinja2 import Template @@ -50,10 +51,13 @@ class GitHub: return response.json() def iter_recent_authors(self): - commits = self.request("/repos/pydanny/cookiecutter-django/commits") - for commit in commits: - login = commit["author"]["login"] - if login not in BOT_LOGINS: + query_params = urlencode( + {"state": "closed", "sort": "updated", "direction": "desc"} + ) + pulls = self.request(f"/repos/pydanny/cookiecutter-django/pulls?{query_params}") + for pull_request in pulls: + login = pull_request["user"]["login"] + if pull_request["merged_at"] and login not in BOT_LOGINS: yield login def fetch_user_info(self, username): From 34f93aaf10fde6f5e8b21fae75cc5863fd49b9d5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 11 Aug 2020 16:59:41 +0100 Subject: [PATCH 126/389] Fix bugs when name or twitter username are null --- scripts/update_contributors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index c7337764..06982bdc 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -81,9 +81,9 @@ class ContributorsJSONFile: def add_contributor(self, user_data): """Append the contributor data we care about at the end.""" contributor_data = { - "name": user_data["name"], + "name": user_data.get("name", user_data["login"]), "github_login": user_data["login"], - "twitter_username": user_data["twitter_username"], + "twitter_username": user_data.get("twitter_username", ""), } self.content.append(contributor_data) From 05d548b78f6dbf01d572dea486865b198e483e21 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 11 Aug 2020 17:17:12 +0100 Subject: [PATCH 127/389] Switch to PyGithub rather than custom API wrapper --- requirements.txt | 2 +- scripts/update_contributors.py | 66 +++++++++++++--------------------- 2 files changed, 26 insertions(+), 42 deletions(-) diff --git a/requirements.txt b/requirements.txt index b04e4012..4eb19f8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,5 +19,5 @@ pyyaml==5.3.1 # Scripting # ------------------------------------------------------------------------------ -requests +PyGithub jinja2 diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 06982bdc..180e7e17 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -1,8 +1,7 @@ import json from pathlib import Path -from urllib.parse import urlencode - -import requests +from github import Github +from github.NamedUser import NamedUser from jinja2 import Template CURRENT_FILE = Path(__file__) @@ -18,50 +17,35 @@ def main() -> None: 2. Add missing ones to the JSON file 3. Generate Markdown from JSON file """ - # Use Github API to fetch recent authors rather than - # git CLI because we need to know their GH username - gh = GitHub() - recent_authors = set(gh.iter_recent_authors()) + recent_authors = set(iter_recent_authors()) # Add missing users to the JSON file contrib_file = ContributorsJSONFile() - for username in recent_authors: - print(f"Checking if {username} should be added") - if username not in contrib_file: - user_data = gh.fetch_user_info(username) - contrib_file.add_contributor(user_data) - print(f"Added {username} to contributors") + for author in recent_authors: + print(f"Checking if {author.login} should be added") + if author.login not in contrib_file: + contrib_file.add_contributor(author) + print(f"Added {author.login} to contributors") contrib_file.save() # Generate MD file from JSON file write_md_file(contrib_file.content) -class GitHub: - """Small wrapper around Github REST API.""" +def iter_recent_authors(): + """ + Fetch users who opened recently merged pull requests. - base_url = "https://api.github.com" - - def __init__(self) -> None: - self.session = requests.Session() - - def request(self, endpoint): - response = self.session.get(f"{self.base_url}{endpoint}") - response.raise_for_status() - return response.json() - - def iter_recent_authors(self): - query_params = urlencode( - {"state": "closed", "sort": "updated", "direction": "desc"} - ) - pulls = self.request(f"/repos/pydanny/cookiecutter-django/pulls?{query_params}") - for pull_request in pulls: - login = pull_request["user"]["login"] - if pull_request["merged_at"] and login not in BOT_LOGINS: - yield login - - def fetch_user_info(self, username): - return self.request(f"/users/{username}") + Use Github API to fetch recent authors rather than + git CLI to work with Github usernames. + """ + repo = Github().get_repo("pydanny/cookiecutter-django") + recent_pulls = repo.get_pulls( + state="closed", sort="updated", direction="desc" + ).get_page(0) + for pull in recent_pulls: + if pull.merged and pull.user.login not in BOT_LOGINS: + yield pull.user class ContributorsJSONFile: @@ -78,12 +62,12 @@ class ContributorsJSONFile: """Provide a nice API to do: `username in file`.""" return any(github_login == contrib["github_login"] for contrib in self.content) - def add_contributor(self, user_data): + def add_contributor(self, user: NamedUser): """Append the contributor data we care about at the end.""" contributor_data = { - "name": user_data.get("name", user_data["login"]), - "github_login": user_data["login"], - "twitter_username": user_data.get("twitter_username", ""), + "name": user.name or user.login, + "github_login": user.login, + "twitter_username": user.twitter_username or "", } self.content.append(contributor_data) From 13c1182553bc666f7a642dc72947f8a5b80103e2 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 11 Aug 2020 16:20:28 +0000 Subject: [PATCH 128/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index aeb0b61f..e749ec14 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1012,5 +1012,10 @@ "name": "Yuchen Xie", "github_login": "mapx", "twitter_username": "" + }, + { + "name": "enchance", + "github_login": "enchance", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d033b1d9..f88512a3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -607,6 +607,13 @@ Listed in alphabetical order. bloodpet + + enchance + + enchance + + + Eraldo Energy From 6ce39c7667e8df6908f1eccc810d36b79bd1f4d4 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 12 Aug 2020 11:30:01 +0000 Subject: [PATCH 129/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index e749ec14..febc1fb1 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1017,5 +1017,10 @@ "name": "enchance", "github_login": "enchance", "twitter_username": "" + }, + { + "name": "Jan Fabry", + "github_login": "janfabry", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f88512a3..b4f2bfcb 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -789,6 +789,13 @@ Listed in alphabetical order. + + Jan Fabry + + janfabry + + + Jan Van Bruggen From 499af1b2034dddfab24646f8d3c8effd42827bef Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 12 Aug 2020 12:31:32 +0100 Subject: [PATCH 130/389] Update isort in pre-commit hook config --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 734a0a71..1be2f6a4 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 4.3.21 + rev: 5.3.2 hooks: - id: isort From 3d1067fb56dea48e7b47f3b5b769035fcf847f5b Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 12 Aug 2020 12:52:58 +0100 Subject: [PATCH 131/389] Workflow to run pre-commit autoupdate --- .github/workflows/pre-commit-autoupdate.yml | 35 +++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/pre-commit-autoupdate.yml diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml new file mode 100644 index 00000000..2ecb0032 --- /dev/null +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -0,0 +1,35 @@ +# Run pre-commit autoupdate every day at midnight +# and create a pull request if any changes + + +name: Pre-commit auto-update + +on: + schedule: + - cron: "0 0 * * *" + workflow_dispatch: # to trigger manually + +jobs: + auto-update: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2.1.1 + with: + python-version: 3.8 + + - name: Install pre-commit + run: pip install pre-commit + - name: Run pre-commit autoupdate + run: pre-commit autoupdate + working-directory: {{cookiecutter.project_slug}} + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + branch: update/pre-commit-autoupdate + title: Auto-update pre-commit hooks + commit-message: Auto-update pre-commit hooks + body: Update versions of tools in pre-commit configs to latest version + labels: update From 4db39b531919ec3782dd6b7a5af1c5fff894db1a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 12 Aug 2020 12:55:37 +0100 Subject: [PATCH 132/389] Fix syntax --- .github/workflows/pre-commit-autoupdate.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 2ecb0032..4beaa578 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -20,9 +20,10 @@ jobs: - name: Install pre-commit run: pip install pre-commit + - name: Run pre-commit autoupdate + working-directory: "{{cookiecutter.project_slug}}" run: pre-commit autoupdate - working-directory: {{cookiecutter.project_slug}} - name: Create Pull Request uses: peter-evans/create-pull-request@v2 From 5ae7d718bde5b25dbd93be5f36acba34fa88c416 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Aug 2020 11:56:34 +0000 Subject: [PATCH 133/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 1be2f6a4..921a87b7 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -4,7 +4,7 @@ fail_fast: true repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: master + rev: v3.2.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer From 266596f16b09dbc8d7f0551ab0dfacee9e6b32bb Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 12 Aug 2020 13:11:17 +0100 Subject: [PATCH 134/389] Only consider users of type 'User' --- scripts/update_contributors.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 180e7e17..b77a3518 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -44,7 +44,11 @@ def iter_recent_authors(): state="closed", sort="updated", direction="desc" ).get_page(0) for pull in recent_pulls: - if pull.merged and pull.user.login not in BOT_LOGINS: + if ( + pull.merged + and pull.user.type == "User" + and pull.user.login not in BOT_LOGINS + ): yield pull.user From 632bbd0a0892ead6b2fce183f0cee8dedb6587c6 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 12 Aug 2020 13:11:54 +0100 Subject: [PATCH 135/389] Only fetch 5 entries per page to limit GH API usage --- scripts/update_contributors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index b77a3518..e00593ea 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -39,7 +39,7 @@ def iter_recent_authors(): Use Github API to fetch recent authors rather than git CLI to work with Github usernames. """ - repo = Github().get_repo("pydanny/cookiecutter-django") + repo = Github(per_page=5).get_repo("pydanny/cookiecutter-django") recent_pulls = repo.get_pulls( state="closed", sort="updated", direction="desc" ).get_page(0) From 6e17bd2e6bea21433544fbd8c94c5129264424fd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 12 Aug 2020 23:55:18 -0700 Subject: [PATCH 136/389] Update isort from 5.3.2 to 5.4.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 17cebc3c..63eb9759 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==19.10b0 -isort==5.3.2 +isort==5.4.0 flake8==3.8.3 flake8-isort==4.0.0 From 2d410c5df99291f31ad5af9c262e5cd49a186e76 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 13 Aug 2020 01:34:47 -0700 Subject: [PATCH 137/389] Update factory-boy from 2.12.0 to 3.0.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 78913593..e437ca56 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,7 @@ pre-commit==2.6.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ -factory-boy==2.12.0 # https://github.com/FactoryBoy/factory_boy +factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.5 # https://github.com/django-extensions/django-extensions From 55d3d9533318db26b3ca0656ca78c6b352b97730 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 13 Aug 2020 10:08:53 -0400 Subject: [PATCH 138/389] Add STATICFILES_STORAGE with compressor support --- {{cookiecutter.project_slug}}/config/settings/production.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 3d4f324c..ce381715 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -236,10 +236,12 @@ ANYMAIL = {} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True) # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE -{%- if cookiecutter.cloud_provider == 'AWS' %} +{%- if cookiecutter.cloud_provider == 'AWS' and cookiecutter.use_whitenoise == 'y' %} COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" -{%- elif cookiecutter.cloud_provider == 'GCP' %} +{%- elif cookiecutter.cloud_provider == 'GCP' and cookiecutter.use_whitenoise == 'y' %} COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage" +{%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %} +COMPRESS_STORAGE = STATICFILES_STORAGE {%- elif cookiecutter.cloud_provider == 'None' %} COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage" {%- endif %} From 1cb2a0c98e3d54b4f2e89426e678f73713be94b6 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 13 Aug 2020 10:13:40 -0400 Subject: [PATCH 139/389] Set COMPRESS_ROOT to STATIC_ROOT for compressor Django compressor also recommends the `COMPRESS_ROOT` be the STATIC_ROOT. This also makes sure the utils is set up properly so that the CACHE directory is actually publicly available (it'll be inside the static directory as a subdirectory). --- {{cookiecutter.project_slug}}/config/settings/production.py | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index ce381715..f64ad1d2 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -242,6 +242,7 @@ COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage" {%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %} COMPRESS_STORAGE = STATICFILES_STORAGE +COMPRESS_ROOT = STATIC_ROOT {%- elif cookiecutter.cloud_provider == 'None' %} COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage" {%- endif %} From 148d6c2e29e6095ad2ae451be043dece513836a2 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 13 Aug 2020 10:24:51 -0400 Subject: [PATCH 140/389] Added noqa F405 to undefined STATIC_ROOT - flake8 * This is in addition to the PR for compressor support with AWS S3 and Google Cloud buckets --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index f64ad1d2..7a816722 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -242,7 +242,7 @@ COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage" {%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %} COMPRESS_STORAGE = STATICFILES_STORAGE -COMPRESS_ROOT = STATIC_ROOT +COMPRESS_ROOT = STATIC_ROOT # noqa F405 {%- elif cookiecutter.cloud_provider == 'None' %} COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage" {%- endif %} From ebd43bbd3c29ff29cdf2617e661b857b89eb520c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 13 Aug 2020 20:59:56 +0100 Subject: [PATCH 141/389] Update runtime.txt --- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 385705b5..43b47fb4 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.8.3 +python-3.8.5 From 59d92d9eb4dc50b16443cb0f999408462bcabf60 Mon Sep 17 00:00:00 2001 From: Jimmy Gitonga Date: Fri, 14 Aug 2020 01:00:17 +0300 Subject: [PATCH 142/389] Update docs/developing-locally-docker.rst Co-authored-by: Bruno Alla --- docs/developing-locally-docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index b5672e22..0bf52295 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -280,7 +280,7 @@ Rebuild your ``docker`` application. :: $ docker-compose -f local.yml up -d --build -Go to your browser and type in your usrl, `` +Go to your browser and type in your URL bar ``https://my-dev-env.local`` See `https with nginx`_ for more information on this configuration. From ddcafff94fce980ac1e3ed21debe1d09e1f5c97d Mon Sep 17 00:00:00 2001 From: Jimmy Gitonga Date: Fri, 14 Aug 2020 01:01:17 +0300 Subject: [PATCH 143/389] Update docs/developing-locally-docker.rst Co-authored-by: Bruno Alla --- docs/developing-locally-docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 0bf52295..17ea725b 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -270,7 +270,7 @@ local.yml The services run behind the reverse proxy. config/settings/local.py -~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~ You should allow the new hostname. :: From d411ed9b6a43e9fbf7e15eff2d2367f380887920 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Thu, 13 Aug 2020 18:45:37 -0400 Subject: [PATCH 144/389] Update compressor not check whitenoise condition --- .../config/settings/production.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 7a816722..89049cad 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -235,16 +235,11 @@ ANYMAIL = {} # ------------------------------------------------------------------------------ # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True) -# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE -{%- if cookiecutter.cloud_provider == 'AWS' and cookiecutter.use_whitenoise == 'y' %} -COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" -{%- elif cookiecutter.cloud_provider == 'GCP' and cookiecutter.use_whitenoise == 'y' %} -COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage" -{%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %} -COMPRESS_STORAGE = STATICFILES_STORAGE -COMPRESS_ROOT = STATIC_ROOT # noqa F405 -{%- elif cookiecutter.cloud_provider == 'None' %} +{%- if cookiecutter.cloud_provider == 'None' %} COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage" +{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %} +# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE +COMPRESS_STORAGE = STATICFILES_STORAGE {%- endif %} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %} # noqa F405{% endif %} From aa261ddbb7908c098c7b9c3e36c81c3bda8ae71c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 14 Aug 2020 00:20:41 +0000 Subject: [PATCH 145/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 921a87b7..5ff2d62b 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.3.2 + rev: 5.4.1 hooks: - id: isort From 363b6eed4ef32340cba3c43b4900c5dff98ebcdd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 13 Aug 2020 23:55:15 -0700 Subject: [PATCH 146/389] Update isort from 5.4.0 to 5.4.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 63eb9759..a1cb16ee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==19.10b0 -isort==5.4.0 +isort==5.4.1 flake8==3.8.3 flake8-isort==4.0.0 From 7e87a92596b66828575f71e6b2235dd030db1d34 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 14 Aug 2020 08:12:55 +0100 Subject: [PATCH 147/389] Add missing comment over settings --- {{cookiecutter.project_slug}}/config/settings/production.py | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 89049cad..2f1b52e7 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -236,6 +236,7 @@ ANYMAIL = {} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True) {%- if cookiecutter.cloud_provider == 'None' %} +# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage" {%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %} # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE From dfdc3e729fbc577da1a204defc295cae4187a479 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 14 Aug 2020 07:17:53 +0000 Subject: [PATCH 148/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index febc1fb1..99121fdc 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1022,5 +1022,10 @@ "name": "Jan Fabry", "github_login": "janfabry", "twitter_username": "" + }, + { + "name": "Jimmy Gitonga", + "github_login": "Afrowave", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b4f2bfcb..dee97bef 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -838,6 +838,13 @@ Listed in alphabetical order. afrowave + + Jimmy Gitonga + + Afrowave + + + John Cass From be340d24d25cd96ae3549dae86f76cf60a3b5c38 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 14 Aug 2020 08:24:34 +0100 Subject: [PATCH 149/389] Remove duplicated contributor --- .github/contributors.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/contributors.json b/.github/contributors.json index 99121fdc..43e52913 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -575,7 +575,7 @@ }, { "name": "Jimmy Gitonga", - "github_login": "afrowave", + "github_login": "Afrowave", "twitter_username": "afrowave" }, { @@ -1022,10 +1022,5 @@ "name": "Jan Fabry", "github_login": "janfabry", "twitter_username": "" - }, - { - "name": "Jimmy Gitonga", - "github_login": "Afrowave", - "twitter_username": "" } -] \ No newline at end of file +] From 3c1f2f0923f859939768a87c132d17483dde91b1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 14 Aug 2020 07:25:26 +0000 Subject: [PATCH 150/389] Update Contributors --- .github/contributors.json | 2 +- CONTRIBUTORS.md | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/contributors.json b/.github/contributors.json index 43e52913..e65ddcd3 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1023,4 +1023,4 @@ "github_login": "janfabry", "twitter_username": "" } -] +] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index dee97bef..752aa9e5 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -831,19 +831,12 @@ Listed in alphabetical order. Adys - - Jimmy Gitonga - - afrowave - - afrowave - Jimmy Gitonga Afrowave - + afrowave John Cass From 6c63143f3bf4fdbc195fea83708b2514da6a5442 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 14 Aug 2020 08:27:57 +0100 Subject: [PATCH 151/389] Avoid duplicate contributors due to different case --- scripts/update_contributors.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index e00593ea..8423ccd6 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -64,7 +64,11 @@ class ContributorsJSONFile: def __contains__(self, github_login: str): """Provide a nice API to do: `username in file`.""" - return any(github_login == contrib["github_login"] for contrib in self.content) + return any( + # Github usernames are case insensitive + github_login.lower() == contrib["github_login"].lower() + for contrib in self.content + ) def add_contributor(self, user: NamedUser): """Append the contributor data we care about at the end.""" From 0ebd35dd8369ea4faa5d3af75362cef15944cec0 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 14 Aug 2020 12:19:42 +0100 Subject: [PATCH 152/389] Update deprecated imports --- .../{{cookiecutter.project_slug}}/users/tests/factories.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py index 8917c5ae..1a78f132 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py @@ -1,7 +1,8 @@ from typing import Any, Sequence from django.contrib.auth import get_user_model -from factory import DjangoModelFactory, Faker, post_generation +from factory import Faker, post_generation +from factory.django import DjangoModelFactory class UserFactory(DjangoModelFactory): From 5e3abf903f60a5a88d1f0c52af1f37ce86d54bad Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 Aug 2020 04:19:56 -0700 Subject: [PATCH 153/389] Update sphinx from 3.2.0 to 3.2.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 78913593..f615195d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.2.0 # https://github.com/sphinx-doc/sphinx +sphinx==3.2.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 89420f2932a6a67512c23524631caa5b717308a8 Mon Sep 17 00:00:00 2001 From: Demetris Stavrou <1180929+demestav@users.noreply.github.com> Date: Fri, 14 Aug 2020 15:09:36 +0300 Subject: [PATCH 154/389] Update linters.rst Related to #2744 issue. --- docs/linters.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/linters.rst b/docs/linters.rst index 2d623218..a4f60cc8 100644 --- a/docs/linters.rst +++ b/docs/linters.rst @@ -19,7 +19,7 @@ The config for flake8 is located in setup.cfg. It specifies: pylint ------ -This is included in flake8's checks, but you can also run it separately to see a more detailed report: :: +To run pylint: :: $ pylint From 3752997562adfbb7769219ded50e1b6b5d83e24c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 Aug 2020 15:49:18 -0700 Subject: [PATCH 155/389] Update sentry-sdk from 0.16.3 to 0.16.5 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 385c7489..309a6b6a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.16.3 # https://github.com/getsentry/sentry-python +sentry-sdk==0.16.5 # 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 From 727ad58d065dabbae619cce8766dc803bc1c7b2b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 14 Aug 2020 23:10:21 -0700 Subject: [PATCH 156/389] Update isort from 5.4.1 to 5.4.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a1cb16ee..270d2535 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==19.10b0 -isort==5.4.1 +isort==5.4.2 flake8==3.8.3 flake8-isort==4.0.0 From ba5c1a760f9ab62a68321ae15a1607449c28b8fd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 16 Aug 2020 00:21:36 +0000 Subject: [PATCH 157/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 5ff2d62b..faca7908 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.4.1 + rev: 5.4.2 hooks: - id: isort From 7d499e05aff036432fe1483529d52f4765ccabe2 Mon Sep 17 00:00:00 2001 From: Corey Garvey Date: Wed, 19 Aug 2020 15:38:59 +0100 Subject: [PATCH 158/389] Update CONTRIBUTORS.rst --- CONTRIBUTORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index eab2132f..3faa87d5 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -93,6 +93,7 @@ Listed in alphabetical order. Cole Mackenzie `@cmackenzie1`_ Cole Maclean `@cole`_ @cole Collederas `@Collederas`_ + Corey Garvey `@coreygarvey`_ Craig Margieson `@cmargieson`_ Cristian Vargas `@cdvv7788`_ Cullen Rhodes `@c-rhodes`_ From 4f7204744667184bc2fc48a2e039bf44282a1a27 Mon Sep 17 00:00:00 2001 From: Corey Garvey Date: Wed, 19 Aug 2020 15:40:13 +0100 Subject: [PATCH 159/389] Updating production path to be hidden folder --- docs/developing-locally-docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 17ea725b..0d582d48 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -116,7 +116,7 @@ Consider the aforementioned ``.envs/.local/.postgres``: :: The three envs we are presented with here are ``POSTGRES_DB``, ``POSTGRES_USER``, and ``POSTGRES_PASSWORD`` (by the way, their values have also been generated for you). You might have figured out already where these definitions will end up; it's all the same with ``django`` service container envs. -One final touch: should you ever need to merge ``.envs/production/*`` in a single ``.env`` run the ``merge_production_dotenvs_in_dotenv.py``: :: +One final touch: should you ever need to merge ``.envs/.production/*`` in a single ``.env`` run the ``merge_production_dotenvs_in_dotenv.py``: :: $ python merge_production_dotenvs_in_dotenv.py From 10d88c50f3f734d281e7d2bf128a2d8de6e53ba1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 19 Aug 2020 19:19:20 +0000 Subject: [PATCH 160/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index e65ddcd3..71488099 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1022,5 +1022,10 @@ "name": "Jan Fabry", "github_login": "janfabry", "twitter_username": "" + }, + { + "name": "Corey Garvey", + "github_login": "coreygarvey", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 752aa9e5..0174628e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -439,6 +439,13 @@ Listed in alphabetical order. + + Corey Garvey + + coreygarvey + + + Craig Margieson From cc1d297ad6eaa9af8d6632eb46a15beb06154dc3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 23 Aug 2020 12:35:31 -0700 Subject: [PATCH 161/389] Update pre-commit from 2.6.0 to 2.7.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 5afe7693..01538655 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.6.0 # https://github.com/pre-commit/pre-commit +pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 32b81ba02e260f75dc00865f89ebcb112f1f4050 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 24 Aug 2020 09:54:47 -0700 Subject: [PATCH 162/389] Update sentry-sdk from 0.16.5 to 0.17.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 309a6b6a..ce493a3c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.16.5 # https://github.com/getsentry/sentry-python +sentry-sdk==0.17.0 # 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 From 294d20d5e6fdd5aa4fc726ecad1ce8e69403e9a0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 25 Aug 2020 05:08:22 -0700 Subject: [PATCH 163/389] Update django-cors-headers from 3.4.0 to 3.5.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index d24b5071..71f7cf5a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,5 +41,5 @@ django-redis==4.12.1 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == "y" %} # Django REST Framework djangorestframework==3.11.1 # https://github.com/encode/django-rest-framework -django-cors-headers==3.4.0 # https://github.com/adamchainz/django-cors-headers +django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers {%- endif %} From b8618430c96f552a97170d02626ca998d91036c3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 26 Aug 2020 10:05:23 -0700 Subject: [PATCH 164/389] Update black from 19.10b0 to 20.8b1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 270d2535..9661a823 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==19.10b0 +black==20.8b1 isort==5.4.2 flake8==3.8.3 flake8-isort==4.0.0 From 0dc3fe0b3d15faa394a6d2d2180c0fc976c0ac8c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 26 Aug 2020 10:05:24 -0700 Subject: [PATCH 165/389] Update black from 19.10b0 to 20.8b1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 01538655..1b3b7fa0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild flake8==3.8.3 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.2.1 # https://github.com/nedbat/coveragepy -black==19.10b0 # https://github.com/ambv/black +black==20.8b1 # https://github.com/ambv/black pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery From bc584203641497cba526a07cc44ec9ae36372e42 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Aug 2020 00:22:07 +0000 Subject: [PATCH 166/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index faca7908..29782601 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: - id: check-yaml - repo: https://github.com/psf/black - rev: 19.10b0 + rev: 20.8b1 hooks: - id: black From e21869c1d4268c786451f45171b56b69abaca41c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 27 Aug 2020 09:41:28 +0200 Subject: [PATCH 167/389] Fix black formatting issues --- tests/test_cookiecutter_generation.py | 10 ++++++++-- .../{{cookiecutter.project_slug}}/users/models.py | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 89b9b856..f9bfcd53 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -175,7 +175,10 @@ def test_black_passes(cookies, context_override): @pytest.mark.parametrize( ["use_docker", "expected_test_script"], - [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),], + [ + ("n", "pytest"), + ("y", "docker-compose -f local.yml run django pytest"), + ], ) def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_script): context.update({"ci_tool": "Travis", "use_docker": use_docker}) @@ -197,7 +200,10 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip @pytest.mark.parametrize( ["use_docker", "expected_test_script"], - [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),], + [ + ("n", "pytest"), + ("y", "docker-compose -f local.yml run django pytest"), + ], ) def test_gitlab_invokes_flake8_and_pytest( cookies, context, use_docker, expected_test_script diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py index 70efdfde..8391bc03 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py @@ -5,8 +5,7 @@ from django.utils.translation import gettext_lazy as _ class User(AbstractUser): - """Default user for {{cookiecutter.project_name}}. - """ + """Default user for {{cookiecutter.project_name}}.""" #: First and last name do not cover name patterns around the globe name = CharField(_("Name of User"), blank=True, max_length=255) From 8a5eae8f87c9d2610059e10aa334167cfa6aac3f Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 27 Aug 2020 10:33:47 +0200 Subject: [PATCH 168/389] Remove feature branch used for testing --- .github/workflows/update-contributors.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index f9553257..acae4729 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - auto-generate-contributors jobs: build: From 18af7523fc7a20d52e4b684d6dd0bc0aa2fe7c85 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 27 Aug 2020 05:17:04 -0700 Subject: [PATCH 169/389] Pin pygithub to latest version 1.53 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 96d5046e..5f92a09e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,5 +19,5 @@ pyyaml==5.3.1 # Scripting # ------------------------------------------------------------------------------ -PyGithub +PyGithub==1.53 jinja2 From 814dfa26e45296130ce74521600082cf7b1146ad Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 27 Aug 2020 07:02:49 -0700 Subject: [PATCH 170/389] Pin jinja2 to latest version 2.11.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5f92a09e..7444d12b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,4 +20,4 @@ pyyaml==5.3.1 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.53 -jinja2 +jinja2==2.11.2 From 688739cb3981b779beb8431ed6208ae5e595ff02 Mon Sep 17 00:00:00 2001 From: Jelmer Draaijer Date: Fri, 28 Aug 2020 10:17:34 +0200 Subject: [PATCH 171/389] Add environment and traces_sample_rate keyword to sentry_sdk.init --- docs/settings.rst | 2 ++ .../config/settings/production.py | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/settings.rst b/docs/settings.rst index 949d5f35..7563f50d 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -49,6 +49,8 @@ DJANGO_AWS_S3_CUSTOM_DOMAIN AWS_S3_CUSTOM_DOMAIN n/a DJANGO_GCP_STORAGE_BUCKET_NAME GS_BUCKET_NAME n/a raises error GOOGLE_APPLICATION_CREDENTIALS n/a n/a raises error SENTRY_DSN SENTRY_DSN n/a raises error +SENTRY_ENVIRONMENT n/a n/a production +SENTRY_TRACES_SAMPLE_RATE n/a n/a 0.0 DJANGO_SENTRY_LOG_LEVEL SENTRY_LOG_LEVEL n/a logging.INFO MAILGUN_API_KEY MAILGUN_API_KEY n/a raises error MAILGUN_DOMAIN MAILGUN_SENDER_DOMAIN n/a raises error diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 2f1b52e7..7b2776bf 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -353,13 +353,17 @@ sentry_logging = LoggingIntegration( ) {%- if cookiecutter.use_celery == 'y' %} +integrations = [sentry_logging, DjangoIntegration(), CeleryIntegration()] +{% else %} +integrations = [sentry_logging, DjangoIntegration()] +{% endif -%} + sentry_sdk.init( dsn=SENTRY_DSN, - integrations=[sentry_logging, DjangoIntegration(), CeleryIntegration()], + integrations=integrations, + environment=env("SENTRY_ENVIRONMENT", default="production"), + traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE", default=0.0), ) -{% else %} -sentry_sdk.init(dsn=SENTRY_DSN, integrations=[sentry_logging, DjangoIntegration()]) -{% endif -%} {% endif %} # Your stuff... # ------------------------------------------------------------------------------ From d17321dfbe65846f3c0f552e9dad3b4c0fc8301b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 28 Aug 2020 14:55:22 -0700 Subject: [PATCH 172/389] Update sentry-sdk from 0.17.0 to 0.17.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index ce493a3c..16766cbc 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.17.0 # https://github.com/getsentry/sentry-python +sentry-sdk==0.17.1 # 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 From 54e8f262193d2022e305896bd2a2d6e5a0f7ecca Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 28 Aug 2020 19:31:17 -0700 Subject: [PATCH 173/389] Update sh from 1.13.1 to 1.14.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7444d12b..7f3f6e31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==1.7.2 -sh==1.13.1 +sh==1.14.0 binaryornot==0.4.4 # Code quality From baf5e6e74ecb1695fd030a6af2eed47b43144670 Mon Sep 17 00:00:00 2001 From: Howie Zhao Date: Sat, 29 Aug 2020 11:53:24 +0800 Subject: [PATCH 174/389] chore: exclude venv directory --- {{cookiecutter.project_slug}}/setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index 6520aff7..5bde75cf 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -1,10 +1,10 @@ [flake8] max-line-length = 120 -exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules +exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv [pycodestyle] max-line-length = 120 -exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules +exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv [mypy] python_version = 3.8 From 2c82c4e1da6f2aa9454080b8b25ea56b3ad9de6a Mon Sep 17 00:00:00 2001 From: Howie Zhao Date: Sat, 29 Aug 2020 11:59:29 +0800 Subject: [PATCH 175/389] chore: update document link --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 2f1b52e7..5528d166 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -34,7 +34,7 @@ CACHES = { "OPTIONS": { "CLIENT_CLASS": "django_redis.client.DefaultClient", # Mimicing memcache behavior. - # http://jazzband.github.io/django-redis/latest/#_memcached_exceptions_behavior + # https://github.com/jazzband/django-redis#memcached-exceptions-behavior "IGNORE_EXCEPTIONS": True, }, } From aeefbc060fd7ed0ea7194725290d188df44fa207 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Aug 2020 00:15:40 -0700 Subject: [PATCH 176/389] Update django-storages from 1.9.1 to 1.10 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index ce493a3c..ec0071d9 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,7 +17,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.9.1 # https://github.com/jschneier/django-storages +django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} django-storages[google]==1.9.1 # https://github.com/jschneier/django-storages {%- endif %} From 0c23267806f80dfb9fdd4dd053081c191744445d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Aug 2020 00:15:41 -0700 Subject: [PATCH 177/389] Update django-storages from 1.9.1 to 1.10 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index ec0071d9..d988e107 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- if cookiecutter.cloud_provider == 'AWS' %} django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.9.1 # https://github.com/jschneier/django-storages +django-storages[google]==1.10 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==7.2.1 # https://github.com/anymail/django-anymail From 2f7a6c3013be3c7f78d7ec8987c2da6929414805 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Aug 2020 05:45:27 -0700 Subject: [PATCH 178/389] Update sphinx-autobuild from 0.7.1 to 2020.9.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 1b3b7fa0..f5f17a44 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -21,7 +21,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ sphinx==3.2.1 # https://github.com/sphinx-doc/sphinx -sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild +sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ From fe9c9b5e48c84a05fd2147314179ab70fba45062 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 31 Aug 2020 11:53:48 -0700 Subject: [PATCH 179/389] Update django-extensions from 3.0.5 to 3.0.6 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 1b3b7fa0..89942cfe 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -40,6 +40,6 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.0.5 # https://github.com/django-extensions/django-extensions +django-extensions==3.0.6 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django From 18c53d0a3b6deeeb26e0ceae93631f353cd4b3bd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 Sep 2020 07:56:55 -0700 Subject: [PATCH 180/389] Update sentry-sdk from 0.17.1 to 0.17.2 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 16766cbc..bcde27ae 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.17.1 # https://github.com/getsentry/sentry-python +sentry-sdk==0.17.2 # 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 From 007ab4aefd8484aed70499efc33d5414c38ba567 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 Sep 2020 07:56:59 -0700 Subject: [PATCH 181/389] Update django from 3.0.9 to 3.0.10 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 71f7cf5a..1c496a25 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn==0.11.8 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==3.0.9 # pyup: < 3.1 # https://www.djangoproject.com/ +django==3.0.10 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils django-allauth==0.42.0 # https://github.com/pennersr/django-allauth From 72bd4d99b20271bbefc7b9301c2146588ec93c8e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 Sep 2020 13:04:19 -0700 Subject: [PATCH 182/389] Update tox from 3.19.0 to 3.20.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7f3f6e31..57938d74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ -tox==3.19.0 +tox==3.20.0 pytest==6.0.1 pytest-cookies==0.5.1 pytest-instafail==0.4.2 From dc1c89688c8062278b53a25f309bf828b6bffeab Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 1 Sep 2020 22:06:01 +0200 Subject: [PATCH 183/389] Update project version in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d1216546..8a5b0b8c 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ except ImportError: # Our version ALWAYS matches the version of Django we support # If Django has a new release, we branch, tag, then update this setting after the tag. -version = "3.0.9" +version = "3.0.10" if sys.argv[-1] == "tag": os.system(f'git tag -a {version} -m "version {version}"') From 53b4371c09c1304e0d684cdfc687ade2835e1181 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 1 Sep 2020 22:20:02 +0200 Subject: [PATCH 184/389] Remove deprecated setting from django-storages --- {{cookiecutter.project_slug}}/config/settings/production.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 2f1b52e7..85440adc 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -86,8 +86,6 @@ _AWS_EXPIRY = 60 * 60 * 24 * 7 AWS_S3_OBJECT_PARAMETERS = { "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate" } -# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings -AWS_DEFAULT_ACL = None # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None) # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront From bd977e29afdb4008e5152578a11e8b4b9bce66b4 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 1 Sep 2020 17:08:30 -0700 Subject: [PATCH 185/389] Update django-extensions from 3.0.6 to 3.0.7 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 62cb409d..26eaf8e7 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -40,6 +40,6 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.0.6 # https://github.com/django-extensions/django-extensions +django-extensions==3.0.7 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django From a115c13ced853e5c1fba283fb062ae556424c996 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 2 Sep 2020 09:57:55 +0200 Subject: [PATCH 186/389] Add issue manager workflow --- .github/workflows/issue-manager.yml | 59 +++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/issue-manager.yml diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml new file mode 100644 index 00000000..3f765817 --- /dev/null +++ b/.github/workflows/issue-manager.yml @@ -0,0 +1,59 @@ +# Automatically close issues that have a keyword mark (an HTML comment) +# in the last comment in the issue, by a group of predefined users, after a custom delay. +# https://github.com/tiangolo/issue-manager + +# Default config: +# +# Wait 10 days and comment: "Assuming the original issue was solved, it will be automatically closed now" + +# Extra config: +# '' +# Wait 10 days and comment: "Automatically closing. To re-open, please provide the additional information requested" + +name: Issue Manager + +on: + schedule: + - cron: "0 0 * * *" + +jobs: + issue-manager: + runs-on: ubuntu-latest + steps: + - uses: tiangolo/issue-manager@0.3.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + + config: > + { + "answered": { + "delay": 864000, + "message": "Assuming the original issue was solved, it will be automatically closed now.", + "users": [ + "pydanny", + "audreyr", + "luzfcb", + "theskumar", + "jayfk", + "burhan", + "webyneter", + "browniebroke", + "sfdye", + ] + }, + "waiting": { + "delay": 864000, + "message": "Automatically closing. To re-open, please provide the additional information requested.", + "users": [ + "pydanny", + "audreyr", + "luzfcb", + "theskumar", + "jayfk", + "burhan", + "webyneter", + "browniebroke", + "sfdye", + ] + } + } From a7c69639f2e3d87e989d4a7ca883fd368927d32d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Sep 2020 02:51:48 -0700 Subject: [PATCH 187/389] Update sentry-sdk from 0.17.2 to 0.17.3 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 7340a892..607faed3 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.17.2 # https://github.com/getsentry/sentry-python +sentry-sdk==0.17.3 # 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 From 992837e274fc9f0b597221d32271f672eb197aa4 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 3 Sep 2020 08:36:06 +0100 Subject: [PATCH 188/389] Fix JSON formatting --- .github/workflows/issue-manager.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml index 3f765817..f6b46527 100644 --- a/.github/workflows/issue-manager.yml +++ b/.github/workflows/issue-manager.yml @@ -13,8 +13,11 @@ name: Issue Manager on: + # Every day at midnight schedule: - cron: "0 0 * * *" + # Manual trigger + workflow_dispatch: jobs: issue-manager: @@ -38,7 +41,7 @@ jobs: "burhan", "webyneter", "browniebroke", - "sfdye", + "sfdye" ] }, "waiting": { @@ -53,7 +56,7 @@ jobs: "burhan", "webyneter", "browniebroke", - "sfdye", + "sfdye" ] } } From 865621c435e238987ea32f17274a2316c1c20db7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 3 Sep 2020 06:41:36 -0700 Subject: [PATCH 189/389] Update isort from 5.4.2 to 5.5.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 57938d74..3a896178 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.4.2 +isort==5.5.0 flake8==3.8.3 flake8-isort==4.0.0 From 84713cf72431a8b49cc3348a744922efaa22677b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2020 00:24:21 +0000 Subject: [PATCH 190/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 29782601..affb6929 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.4.2 + rev: 5.5.0 hooks: - id: isort From 9858c6a86612840dee15c1043d38ac117783e3a0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 4 Sep 2020 06:28:21 -0700 Subject: [PATCH 191/389] Update isort from 5.5.0 to 5.5.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3a896178..7ecdd4d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.5.0 +isort==5.5.1 flake8==3.8.3 flake8-isort==4.0.0 From c6c0bd9289fddc05533d8df9c78c5953471e5e13 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 4 Sep 2020 08:26:40 -0700 Subject: [PATCH 192/389] Update django-extensions from 3.0.7 to 3.0.8 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 26eaf8e7..14421410 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -40,6 +40,6 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.0.7 # https://github.com/django-extensions/django-extensions +django-extensions==3.0.8 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django From b78fbb1a25cef4d3d88cc27ceb4c08ee9807a468 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 4 Sep 2020 17:27:09 +0200 Subject: [PATCH 193/389] Fix typo in docstring --- scripts/update_contributors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py index 8423ccd6..0236daae 100644 --- a/scripts/update_contributors.py +++ b/scripts/update_contributors.py @@ -13,7 +13,7 @@ def main() -> None: """ Script entry point. - 1. Fetch recent contribtors from the Github API + 1. Fetch recent contributors from the Github API 2. Add missing ones to the JSON file 3. Generate Markdown from JSON file """ From df0d332207aad72663056c3de1c24a75edc40e61 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 4 Sep 2020 17:26:24 +0200 Subject: [PATCH 194/389] Automatically generate changelog Fixes #1491 --- .github/changelog-template.md | 9 +++ .github/workflows/update-changelog.yml | 34 +++++++++++ CHANGELOG.md | 2 + scripts/update_changelog.py | 78 ++++++++++++++++++++++++++ 4 files changed, 123 insertions(+) create mode 100644 .github/changelog-template.md create mode 100644 .github/workflows/update-changelog.yml create mode 100644 scripts/update_changelog.py diff --git a/.github/changelog-template.md b/.github/changelog-template.md new file mode 100644 index 00000000..49550ba1 --- /dev/null +++ b/.github/changelog-template.md @@ -0,0 +1,9 @@ +## [{{merge_date.strftime('%Y-%m-%d')}}] +{%- for change_type, pulls in grouped_pulls.items() %} +{%- if pulls %} +### {{ change_type }} +{%- for pull_request in pulls %} +- {{ pull_request.title }} ([#{{ pull_request.number }}]({{ pull_request.url }})) +{%- endfor -%} +{% endif -%} +{% endfor -%} diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml new file mode 100644 index 00000000..562c37eb --- /dev/null +++ b/.github/workflows/update-changelog.yml @@ -0,0 +1,34 @@ +name: Update Changelog + +on: + # Every day at 2am + schedule: + - cron: "0 2 * * *" + # Manual trigger + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: "3.8" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: Update list + run: python scripts/update_changelog.py + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Commit changes + uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Update Changelog + file_pattern: CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 27a8578a..0019b35c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Change Log All enhancements and patches to Cookiecutter Django will be documented in this file. + + ## [2020-04-13] ### Changed - Updated to Python 3.8 (@codnee) diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py new file mode 100644 index 00000000..08ff5b09 --- /dev/null +++ b/scripts/update_changelog.py @@ -0,0 +1,78 @@ +import os +from pathlib import Path +from github import Github +from jinja2 import Template +import datetime as dt + +CURRENT_FILE = Path(__file__) +ROOT = CURRENT_FILE.parents[1] +GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None) + +# Generate changelog for PRs merged yesterday +MERGED_DATE = dt.date.today() - dt.timedelta(days=1) + + +def main() -> None: + """ + Script entry point. + """ + merged_pulls = list(iter_pulls()) + if not merged_pulls: + print("Nothing was merged, existing.") + return + + # Group pull requests by type of change + grouped_pulls = group_pulls_by_change_type(merged_pulls) + + # Generate portion of markdown + rendered_content = generate_md(grouped_pulls) + + # Update CHANGELOG.md file + file_path = ROOT / "CHANGELOG.md" + old_content = file_path.read_text() + updated_content = old_content.replace( + "", + f"\n\n{rendered_content}", + ) + file_path.write_text(updated_content) + + +def iter_pulls(): + """Fetch merged pull requests at the date we're interested in.""" + repo = Github(login_or_token=GITHUB_TOKEN).get_repo("pydanny/cookiecutter-django") + recent_pulls = repo.get_pulls( + state="closed", sort="updated", direction="desc" + ).get_page(0) + for pull in recent_pulls: + if pull.merged and pull.merged_at.date() == MERGED_DATE: + yield pull + + +def group_pulls_by_change_type(pull_requests_list): + """Group pull request by change type.""" + grouped_pulls = { + "Changed": [], + "Fixed": [], + "Updated": [], + } + for pull in pull_requests_list: + label_names = {l.name for l in pull.labels} + if "update" in label_names: + group_name = "Updated" + elif "bug" in label_names: + group_name = "Fixed" + else: + group_name = "Changed" + grouped_pulls[group_name].append(pull) + return grouped_pulls + + +def generate_md(grouped_pulls): + """Generate markdown file from Jinja template.""" + changelog_template = ROOT / ".github" / "changelog-template.md" + template = Template(changelog_template.read_text(), autoescape=True) + return template.render(merge_date=MERGED_DATE, grouped_pulls=grouped_pulls) + + +if __name__ == "__main__": + main() From dbb5a697f9fdcd40ca671d8936020b219bb2d05c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 4 Sep 2020 17:54:28 +0200 Subject: [PATCH 195/389] Auto-generate changelog for the past week --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0019b35c..f9fab837 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,29 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-02] +### Changed +- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2777)) +### Updated +- Update sentry-sdk to 0.17.3 ([#2788](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2788)) +- Update django-extensions to 3.0.7 ([#2787](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2787)) + +## [2020-09-01] +### Changed +- Exclude venv directory and update document link ([#2780](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2780)) +### Updated +- Update tox to 3.20.0 ([#2786](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2786)) +- Update django-storages to 1.10 ([#2781](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2781)) +- Update sentry-sdk to 0.17.2 ([#2784](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2784)) +- Update django to 3.0.10 ([#2785](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2785)) +- Update sphinx-autobuild to 2020.9.1 ([#2782](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2782)) +- Update django-extensions to 3.0.6 ([#2783](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2783)) + +## [2020-08-31] +### Updated +- Update sh to 1.14.0 ([#2779](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2779)) +- Update sentry-sdk to 0.17.1 ([#2778](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2778)) + ## [2020-04-13] ### Changed - Updated to Python 3.8 (@codnee) From 77a00376e8195b73fae5c3dd80efdf5d9b432e3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 5 Sep 2020 00:40:41 +0000 Subject: [PATCH 196/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index affb6929..74839c2c 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.5.0 + rev: 5.5.1 hooks: - id: isort From e6d7b015583b2bebc14853b82753337c13d0f101 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 5 Sep 2020 02:43:34 +0000 Subject: [PATCH 197/389] Update Changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9fab837..93b4b9ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-04] +### Updated +- Update django-extensions to 3.0.8 ([#2792](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2792)) +- Update isort to 5.5.1 ([#2791](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2791)) +- Auto-update pre-commit hooks ([#2790](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2790)) +- Update isort to 5.5.0 ([#2789](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2789)) + ## [2020-09-02] ### Changed - Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2777)) From 4659cb9baa82388436e7e2731359dde4bd58a433 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 6 Sep 2020 02:16:23 +0000 Subject: [PATCH 198/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93b4b9ef..bc397c7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-05] +### Updated +- Auto-update pre-commit hooks ([#2793](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2793)) + ## [2020-09-04] ### Updated - Update django-extensions to 3.0.8 ([#2792](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2792)) From 9cdae535b3b56656e495d544d8f5de461f2c8321 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 6 Sep 2020 19:12:31 -0700 Subject: [PATCH 199/389] Update psycopg2-binary from 2.8.5 to 2.8.6 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 14421410..dad44f82 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -5,7 +5,7 @@ ipdb==0.13.3 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 {%- else %} -psycopg2-binary==2.8.5 # https://github.com/psycopg/psycopg2 +psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2 {%- endif %} {%- if cookiecutter.use_async == 'y' %} watchgod==0.6 # https://github.com/samuelcolvin/watchgod From cbc46cb34f80235831f332168b895a707e4b12b9 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 7 Sep 2020 14:23:02 +0200 Subject: [PATCH 200/389] Update psycopg2 from 2.8.5 to 2.8.6 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index dad44f82..998905a0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,7 +3,7 @@ Werkzeug==1.0.1 # https://github.com/pallets/werkzeug ipdb==0.13.3 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 +psycopg2==2.8.6 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 {%- else %} psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2 {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 607faed3..31e57628 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==20.0.4 # https://github.com/benoitc/gunicorn -psycopg2==2.8.5 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 +psycopg2==2.8.6 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From 7fb71507d2f29049a9b446e4c20122fcaa849911 Mon Sep 17 00:00:00 2001 From: Arnav Choudhury Date: Mon, 7 Sep 2020 17:58:49 +0530 Subject: [PATCH 201/389] Updated Gitlab CI to use Python 3.8 instead of Python 3.7 (#2794) --- CONTRIBUTORS.md | 2 +- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0174628e..2d17cddf 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1463,4 +1463,4 @@ guidance and advice. - Jannis Leidel - Nate Aune -- Barry Morrison \ No newline at end of file +- Barry Morrison diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 246c4c98..60925b81 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -13,7 +13,7 @@ variables: flake8: stage: lint - image: python:3.7-alpine + image: python:3.8-alpine before_script: - pip install -q flake8 script: @@ -21,7 +21,7 @@ flake8: pytest: stage: test - image: python:3.7 + image: python:3.8 {% if cookiecutter.use_docker == 'y' -%} image: docker/compose:latest tags: @@ -39,7 +39,7 @@ pytest: tags: - python services: - - postgres:11 + - postgres:{{ cookiecutter.postgresql_version }} variables: DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB From 17fbe5f4c6b37b45121779b9c5b17f192a338076 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 7 Sep 2020 12:29:24 +0000 Subject: [PATCH 202/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/contributors.json b/.github/contributors.json index 71488099..8c2180bd 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1027,5 +1027,10 @@ "name": "Corey Garvey", "github_login": "coreygarvey", "twitter_username": "" + }, + { + "name": "Arnav Choudhury", + "github_login": "arnav13081994", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 2d17cddf..69ea53f3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -264,6 +264,13 @@ Listed in alphabetical order. + + Arnav Choudhury + + arnav13081994 + + + AsheKR @@ -1463,4 +1470,4 @@ guidance and advice. - Jannis Leidel - Nate Aune -- Barry Morrison +- Barry Morrison \ No newline at end of file From 624dd94dd3738d50f91655d350ca9bf22b6af68f Mon Sep 17 00:00:00 2001 From: Wes Turner <50891+westurner@users.noreply.github.com> Date: Mon, 7 Sep 2020 08:51:52 -0400 Subject: [PATCH 203/389] Add :z/:Z to mounted volumes in {local,production}.yml (#2663) --- {{cookiecutter.project_slug}}/local.yml | 14 +++++++------- {{cookiecutter.project_slug}}/production.yml | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index 528e59b2..a6cbe543 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -17,7 +17,7 @@ services: - mailhog {%- endif %} volumes: - - .:/app + - .:/app:z env_file: - ./.envs/.local/.django - ./.envs/.local/.postgres @@ -32,8 +32,8 @@ services: image: {{ cookiecutter.project_slug }}_production_postgres container_name: postgres volumes: - - local_postgres_data:/var/lib/postgresql/data - - local_postgres_data_backups:/backups + - local_postgres_data:/var/lib/postgresql/data:Z + - local_postgres_data_backups:/backups:z env_file: - ./.envs/.local/.postgres @@ -46,9 +46,9 @@ services: env_file: - ./.envs/.local/.django volumes: - - ./docs:/docs - - ./config:/app/config - - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }} + - ./docs:/docs:z + - ./config:/app/config:z + - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z ports: - "7000:7000" @@ -113,7 +113,7 @@ services: depends_on: - django volumes: - - .:/app + - .:/app:z # http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html - /app/node_modules command: npm run dev diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml index 2cd2af13..93b61b13 100644 --- a/{{cookiecutter.project_slug}}/production.yml +++ b/{{cookiecutter.project_slug}}/production.yml @@ -25,8 +25,8 @@ services: dockerfile: ./compose/production/postgres/Dockerfile image: {{ cookiecutter.project_slug }}_production_postgres volumes: - - production_postgres_data:/var/lib/postgresql/data - - production_postgres_data_backups:/backups + - production_postgres_data:/var/lib/postgresql/data:Z + - production_postgres_data_backups:/backups:z env_file: - ./.envs/.production/.postgres @@ -38,7 +38,7 @@ services: depends_on: - django volumes: - - production_traefik:/etc/traefik/acme + - production_traefik:/etc/traefik/acme:z ports: - "0.0.0.0:80:80" - "0.0.0.0:443:443" @@ -75,5 +75,5 @@ services: env_file: - ./.envs/.production/.django volumes: - - production_postgres_data_backups:/backups + - production_postgres_data_backups:/backups:z {%- endif %} From 756cf6c93545fa43e4330d52ec48bb49a9272925 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 7 Sep 2020 12:52:21 +0000 Subject: [PATCH 204/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 8c2180bd..4f2f96df 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1032,5 +1032,10 @@ "name": "Arnav Choudhury", "github_login": "arnav13081994", "twitter_username": "" + }, + { + "name": "Wes Turner", + "github_login": "westurner", + "twitter_username": "westurner" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 69ea53f3..e0fda25e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1426,6 +1426,13 @@ Listed in alphabetical order. + + Wes Turner + + westurner + + westurner + Will Farley From 0b3dd776c624184cd89dde2b28d81625f1914112 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 7 Sep 2020 15:06:18 +0200 Subject: [PATCH 205/389] Fix options for sphinx-autobuild in docs Makefile (#2799) Fix #2796 --- {{cookiecutter.project_slug}}/docs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile index 90f61de3..4f772cad 100644 --- a/{{cookiecutter.project_slug}}/docs/Makefile +++ b/{{cookiecutter.project_slug}}/docs/Makefile @@ -22,9 +22,9 @@ help: # Build, watch and serve docs with live reload livehtml: sphinx-autobuild -b html - {%- if cookiecutter.use_docker == 'y' %} -H 0.0.0.0 + {%- if cookiecutter.use_docker == 'y' %} --host 0.0.0.0 {%- else %} --open-browser - {%- endif %} -p 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html + {%- endif %} --port 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html # Outputs rst files from django application code apidocs: From ffaec0008405dc528ba869a780c7ec61a36d0942 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 7 Sep 2020 15:10:57 +0200 Subject: [PATCH 206/389] Remove --no-binary option for psycopg2 (#2798) It was required in 2.7, but it's now the default in 2.8 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 998905a0..cc751326 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,7 +3,7 @@ Werkzeug==1.0.1 # https://github.com/pallets/werkzeug ipdb==0.13.3 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} -psycopg2==2.8.6 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 +psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 {%- else %} psycopg2-binary==2.8.6 # https://github.com/psycopg/psycopg2 {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 31e57628..8016786c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -3,7 +3,7 @@ -r base.txt gunicorn==20.0.4 # https://github.com/benoitc/gunicorn -psycopg2==2.8.6 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 +psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 {%- if cookiecutter.use_whitenoise == 'n' %} Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} From 2a0f40e7671fc1f21a18c369403ba6d1f7b13b65 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 7 Sep 2020 15:30:37 +0200 Subject: [PATCH 207/389] Clean up nested venv files from `.gitignore` Fixes #2226 --- .gitignore | 10 ---------- {{cookiecutter.project_slug}}/.gitignore | 12 ------------ 2 files changed, 22 deletions(-) diff --git a/.gitignore b/.gitignore index 386b2651..f753fec9 100644 --- a/.gitignore +++ b/.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 diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index 9850b127..311b43a5 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{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' %} From 8eab7bbdb578f943f5cd5af02a7e68b29150f115 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 8 Sep 2020 02:16:41 +0000 Subject: [PATCH 208/389] Update Changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc397c7c..4c42b869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-07] +### Changed +- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2663)) +- Remove --no-binary option for psycopg2 ([#2798](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2798)) +- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2794)) +### Fixed +- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2799)) +### Updated +- Update psycopg2-binary to 2.8.6 ([#2797](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2797)) + ## [2020-09-05] ### Updated - Auto-update pre-commit hooks ([#2793](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2793)) From 536e86ecadb66a9f37315a73af4dd6255a5a2f39 Mon Sep 17 00:00:00 2001 From: Arnav Choudhury Date: Tue, 8 Sep 2020 13:34:10 +0530 Subject: [PATCH 209/389] Traeffik and Django dockerfile changes (#2801) --- CONTRIBUTORS.md | 2 +- .../compose/production/django/Dockerfile | 16 ++++++++-------- .../compose/production/traefik/Dockerfile | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e0fda25e..dd55e2af 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1477,4 +1477,4 @@ guidance and advice. - Jannis Leidel - Nate Aune -- Barry Morrison \ No newline at end of file +- Barry Morrison diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index 72f71d6e..2e6a195b 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -32,26 +32,26 @@ COPY ./requirements /requirements RUN pip install --no-cache-dir -r /requirements/production.txt \ && rm -rf /requirements -COPY ./compose/production/django/entrypoint /entrypoint +COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint RUN sed -i 's/\r$//g' /entrypoint RUN chmod +x /entrypoint -RUN chown django /entrypoint -COPY ./compose/production/django/start /start + +COPY --chown=django:django ./compose/production/django/start /start RUN sed -i 's/\r$//g' /start RUN chmod +x /start -RUN chown django /start + {%- if cookiecutter.use_celery == "y" %} -COPY ./compose/production/django/celery/worker/start /start-celeryworker +COPY --chown=django:django ./compose/production/django/celery/worker/start /start-celeryworker RUN sed -i 's/\r$//g' /start-celeryworker RUN chmod +x /start-celeryworker -RUN chown django /start-celeryworker -COPY ./compose/production/django/celery/beat/start /start-celerybeat + +COPY --chown=django:django ./compose/production/django/celery/beat/start /start-celerybeat RUN sed -i 's/\r$//g' /start-celerybeat RUN chmod +x /start-celerybeat -RUN chown django /start-celerybeat + COPY ./compose/production/django/celery/flower/start /start-flower RUN sed -i 's/\r$//g' /start-flower diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile index 746aa2b4..26a653d5 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,5 +1,5 @@ FROM traefik:v2.0 -RUN mkdir -p /etc/traefik/acme -RUN touch /etc/traefik/acme/acme.json -RUN chmod 600 /etc/traefik/acme/acme.json +RUN mkdir -p /etc/traefik/acme \ + && touch /etc/traefik/acme/acme.json \ + && chmod 600 /etc/traefik/acme/acme.json COPY ./compose/production/traefik/traefik.yml /etc/traefik From 69209b6fa16147e0260d7e934910fdfa90e3780f Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 8 Sep 2020 08:04:49 +0000 Subject: [PATCH 210/389] Update Contributors --- CONTRIBUTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index dd55e2af..e0fda25e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1477,4 +1477,4 @@ guidance and advice. - Jannis Leidel - Nate Aune -- Barry Morrison +- Barry Morrison \ No newline at end of file From b3028d8299879916097f8f83c6d1f2093d2f0365 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 9 Sep 2020 02:17:01 +0000 Subject: [PATCH 211/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c42b869..dd8b927d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-08] +### Changed +- Traeffik and Django dockerfile changes ([#2801](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2801)) + ## [2020-09-07] ### Changed - Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2663)) From d2e6b285d9fb84a4f622cc8170997b7ece26dc5e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 9 Sep 2020 09:36:07 +0100 Subject: [PATCH 212/389] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 5a5aefc7..c66e6bc7 100644 --- a/.github/FUNDING.yml +++ b/.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 From 949cd5acb7bbf2773496f19285efbc4c94271a3f Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 9 Sep 2020 14:07:30 +0200 Subject: [PATCH 213/389] Update issue and pull request templates --- .github/ISSUE_TEMPLATE.md | 1 - .github/ISSUE_TEMPLATE/bug.md | 32 ++++++++++++++++++-------- .github/ISSUE_TEMPLATE/feature.md | 18 ++++----------- .github/ISSUE_TEMPLATE/improvement.md | 24 ------------------- .github/ISSUE_TEMPLATE/paid-support.md | 8 ++++++- .github/ISSUE_TEMPLATE/question.md | 10 ++++++-- .github/ISSUE_TEMPLATE/regression.md | 28 ---------------------- .github/PULL_REQUEST_TEMPLATE.md | 25 ++++++++------------ cookiecutter.json | 1 - 9 files changed, 51 insertions(+), 96 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/ISSUE_TEMPLATE/improvement.md delete mode 100644 .github/ISSUE_TEMPLATE/regression.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index b232b6e3..00000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -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 diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 2a48c0c3..b2b577f5 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.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 + - -## Steps to reproduce - -[//]: # (Any or all of the following:) -[//]: # (* Host system configuration: OS, Docker & friends' versions etc.) -[//]: # (* Replay file https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html) -[//]: # (* Logs) +* Host system configuration: + * Version of cookiecutter CLI (get it with `cookiecutter --version`): + * OS: + * Python version: + * Docker versions (if using Docker): + * ... +* Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html): + ``` + ``` + +Logs: +
+
+$ cookiecutter https://github.com/pydanny/cookiecutter-django
+project_name [Project Name]: ...
+
+
+ diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md index b0d560d8..8cc8141a 100644 --- a/.github/ISSUE_TEMPLATE/feature.md +++ b/.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?) - - - - -## Use case(s) / visualization(s) - -[//]: # ("Better to see something once than to hear about it a thousand times.") - - +Why should this feature be implemented? diff --git a/.github/ISSUE_TEMPLATE/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md deleted file mode 100644 index 57265237..00000000 --- a/.github/ISSUE_TEMPLATE/improvement.md +++ /dev/null @@ -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.") - - diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md index d565e564..e553329f 100644 --- a/.github/ISSUE_TEMPLATE/paid-support.md +++ b/.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)). diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 0c0f3d89..f24e413f 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.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. diff --git a/.github/ISSUE_TEMPLATE/regression.md b/.github/ISSUE_TEMPLATE/regression.md deleted file mode 100644 index 80384004..00000000 --- a/.github/ISSUE_TEMPLATE/regression.md +++ /dev/null @@ -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) - - diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 45e67c69..5559e62f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.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!) - -[//]: # (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?) + +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?) - - -## Use case(s) / visualization(s) - -[//]: # ("Better to see something once than to hear about it a thousand times.") - - + diff --git a/cookiecutter.json b/cookiecutter.json index ca11b3b4..68206147 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -59,6 +59,5 @@ "Gitlab" ], "keep_local_envs_in_vcs": "y", - "debug": "n" } From 996b958feb319921de75210876ee30771b6b261b Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 9 Sep 2020 14:25:12 +0200 Subject: [PATCH 214/389] Configure Dependabot to update Github actions --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..5ee5d0a0 --- /dev/null +++ b/.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" From 684218a90807d2997b1d25c677349cac72ac1079 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Sep 2020 12:25:44 +0000 Subject: [PATCH 215/389] Update actions/setup-python requirement to v2.1.2 Updates the requirements on [actions/setup-python](https://github.com/actions/setup-python) to permit the latest version. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/commits/24156c231c5e9d581bde27d0cdbb72715060ea51) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 4beaa578..f07d1803 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.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 diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 562c37eb..ac8f749e 100644 --- a/.github/workflows/update-changelog.yml +++ b/.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 diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index acae4729..6dd2ac52 100644 --- a/.github/workflows/update-contributors.yml +++ b/.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 From 8df38802f35afb2201b4db32c04b7c60e176e782 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 9 Sep 2020 15:41:47 -0700 Subject: [PATCH 216/389] Update sentry-sdk from 0.17.3 to 0.17.4 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 8016786c..4ed49434 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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 From a3ed42a28968f243ef42962b709414dae676ab3f Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 10 Sep 2020 02:16:26 +0000 Subject: [PATCH 217/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd8b927d..a3a25226 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [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)) From ca4bbd918d8c0249b2ba68aff17ac8038f924863 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 9 Sep 2020 23:58:50 -0700 Subject: [PATCH 218/389] Update isort from 5.5.1 to 5.5.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7ecdd4d0..3f110e51 100644 --- a/requirements.txt +++ b/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 From 806080e53eeb33ecd82cb7e890ecfb94fbc52f25 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Sep 2020 00:24:40 +0000 Subject: [PATCH 219/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 74839c2c..398ccbf8 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{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 From 625c7ceb7311a5acb173df82af3668ba834b034c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 11 Sep 2020 10:55:38 +0100 Subject: [PATCH 220/389] Fix git-auto-commit-action --- .github/workflows/update-changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index ac8f749e..ef9263f3 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -28,7 +28,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v4.5.1 with: commit_message: Update Changelog file_pattern: CHANGELOG.md From 7ef9f919e201a891040a1b6d788852020541b3b5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 11 Sep 2020 10:56:03 +0100 Subject: [PATCH 221/389] Update update-contributors.yml --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 6dd2ac52..ba7fd74b 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -24,7 +24,7 @@ jobs: run: python scripts/update_contributors.py - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v4.5.1 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 4f631e148388d12d95ef567dcb56d529fee26c63 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 11 Sep 2020 09:58:15 +0000 Subject: [PATCH 222/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3a25226..7855d167 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-10] +### Updated +- Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807)) +- Update sentry-sdk to 0.17.4 ([#2805](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2805)) + ## [2020-09-09] ### Changed - Update actions/setup-python requirement to v2.1.2 ([#2804](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2804)) From e1922807aacd0dee853fdac389e5558b5cfa92d3 Mon Sep 17 00:00:00 2001 From: Arnav Choudhury Date: Fri, 11 Sep 2020 21:47:00 +0530 Subject: [PATCH 223/389] Updating Traefik version from 2.0 to 2.2.11 --- .../compose/production/traefik/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile index 26a653d5..aa879052 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM traefik:v2.0 +FROM traefik:v2.2.11 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From 13ca7bf4a4ea91afcc70021e94170091cd8bdcbc Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:42 -0700 Subject: [PATCH 224/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 4ed49434..047661cd 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -22,7 +22,7 @@ django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages django-storages[google]==1.10 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==7.2.1 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon_ses]==7.2.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} From 11d089c859d11798ee5657870faad417cf6e90ce Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:43 -0700 Subject: [PATCH 225/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 047661cd..0c46da1d 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ django-storages[google]==1.10 # https://github.com/jschneier/django-storages {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==7.2.1 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==7.2.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} From 8cddc2f740812c1837b07ece95e21319f14c565b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:44 -0700 Subject: [PATCH 226/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 0c46da1d..e8e57d94 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -26,7 +26,7 @@ django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==7.2.1 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==7.2.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} From e5c2f82949effe5719ebab00f42c7c13f9bf32db Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:45 -0700 Subject: [PATCH 227/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index e8e57d94..d507b125 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -28,7 +28,7 @@ django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==7.2.1 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==7.2.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} From 99c9b043199c8cbc0d8de0829685170f6464403e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:45 -0700 Subject: [PATCH 228/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index d507b125..2c92ad99 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -30,7 +30,7 @@ django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==7.2.1 # https://github.com/anymail/django-anymail +django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==7.2.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} From e591022c6f3daa6207f36c95588bf1dd1bd6a8a5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:46 -0700 Subject: [PATCH 229/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 2c92ad99..cfdf7dff 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -32,7 +32,7 @@ django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==7.2.1 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} django-anymail[sendinblue]==7.2.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} From 8241615edd35f09dd0b426f07964ffdc80c22001 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:47 -0700 Subject: [PATCH 230/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index cfdf7dff..83f8fdf6 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -34,7 +34,7 @@ django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==7.2.1 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==7.2.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} From bc0805549b540c0484b2a0731fbb1c1ba110da13 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:48 -0700 Subject: [PATCH 231/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 83f8fdf6..b5342b52 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -36,7 +36,7 @@ django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==7.2.1 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} django-anymail==7.2.1 # https://github.com/anymail/django-anymail {%- endif %} From 192ca300af8f052fa3a21dadcbb15761e351ec79 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 15:59:49 -0700 Subject: [PATCH 232/389] Update django-anymail from 7.2.1 to 8.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index b5342b52..ced72c2f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -38,5 +38,5 @@ django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==7.2.1 # https://github.com/anymail/django-anymail +django-anymail==8.0 # https://github.com/anymail/django-anymail {%- endif %} From 33eca9d121479db0e3ea4a8795e745f848be9c3e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 12 Sep 2020 02:16:10 +0000 Subject: [PATCH 233/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7855d167..db5a2d9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-11] +### Updated +- Auto-update pre-commit hooks ([#2809](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2809)) + ## [2020-09-10] ### Updated - Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807)) From c7ee1e7c03ebb59a8833d9fd26ec0d97b5acccb7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 19:16:16 -0700 Subject: [PATCH 234/389] Update pytest from 6.0.1 to 6.0.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3f110e51..f645e14d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.0 -pytest==6.0.1 +pytest==6.0.2 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 From 12cc96817de8208f8ad778428c1e05a577c7ed15 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 11 Sep 2020 19:16:17 -0700 Subject: [PATCH 235/389] Update pytest from 6.0.1 to 6.0.2 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index cc751326..e5eb6c67 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.770 # https://github.com/python/mypy django-stubs==1.5.0 # https://github.com/typeddjango/django-stubs -pytest==6.0.1 # https://github.com/pytest-dev/pytest +pytest==6.0.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation From 62c3f5fd5d8d97686dba27d5a8afe7e368f2d02e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 13 Sep 2020 02:16:38 +0000 Subject: [PATCH 236/389] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db5a2d9c..1b32d6d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-12] +### Updated +- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2814)) +- Update pytest to 6.0.2 ([#2819](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2819)) +- Update django-anymail to 8.0 ([#2818](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2818)) + ## [2020-09-11] ### Updated - Auto-update pre-commit hooks ([#2809](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2809)) From a6b88a9370a0707efb82a0e636f04e5c6f86c4a1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Sep 2020 01:40:32 -0700 Subject: [PATCH 237/389] Update django-storages from 1.10 to 1.10.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index ced72c2f..3ee5e761 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,7 +17,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.10 # https://github.com/jschneier/django-storages +django-storages[boto3]==1.10.1 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} django-storages[google]==1.10 # https://github.com/jschneier/django-storages {%- endif %} From 8b4c87fd12cd2de4fdf5d5a4ae252eb3e6d1af2e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Sep 2020 01:40:33 -0700 Subject: [PATCH 238/389] Update django-storages from 1.10 to 1.10.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 3ee5e761..c6dc2e17 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- if cookiecutter.cloud_provider == 'AWS' %} django-storages[boto3]==1.10.1 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.10 # https://github.com/jschneier/django-storages +django-storages[google]==1.10.1 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail From f1600ef17ba04523e82bf514b2e47cebed4a06ee Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Sep 2020 01:40:37 -0700 Subject: [PATCH 239/389] Update coverage from 5.2.1 to 5.3 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e5eb6c67..9a475e7f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -27,7 +27,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==3.8.3 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort -coverage==5.2.1 # https://github.com/nedbat/coveragepy +coverage==5.3 # https://github.com/nedbat/coveragepy black==20.8b1 # https://github.com/ambv/black pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From 584267d8a4f1674acf8afbe01cd3ea8049f96082 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 14 Sep 2020 08:03:16 -0700 Subject: [PATCH 240/389] Update sentry-sdk from 0.17.4 to 0.17.5 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index c6dc2e17..855a8e29 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.4 # https://github.com/getsentry/sentry-python +sentry-sdk==0.17.5 # 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 From b76d8d4f025590c1ddfb2a4506a932e92c5357f6 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 17 Aug 2020 14:20:00 +0100 Subject: [PATCH 241/389] Revert Celery to 4.4.6 It looks like 4.4.7 has some issues with Redis broker: https://github.com/celery/celery/issues/6285 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 1c496a25..c858b733 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -17,7 +17,7 @@ redis==3.5.3 # https://github.com/andymccurdy/redis-py hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} -celery==4.4.7 # pyup: < 5.0 # https://github.com/celery/celery +celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery django-celery-beat==2.0.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==0.9.5 # https://github.com/mher/flower From ec3922cfe6a4c58f98d3a547207d7993e5ab5ff2 Mon Sep 17 00:00:00 2001 From: Daniel Feldroy Date: Mon, 14 Sep 2020 11:36:47 -0700 Subject: [PATCH 242/389] Give admin_forms the forms namespace This will make extending various signup and registration forms easier. --- .../{{cookiecutter.project_slug}}/users/forms.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py index ba848b85..d2170bb3 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py @@ -1,22 +1,23 @@ -from django.contrib.auth import forms, get_user_model +from django.contrib.auth import get_user_model +from django.contrib.auth import forms as admin_forms from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ User = get_user_model() -class UserChangeForm(forms.UserChangeForm): - class Meta(forms.UserChangeForm.Meta): +class UserChangeForm(admin_forms.UserChangeForm): + class Meta(admin_forms.UserChangeForm.Meta): model = User -class UserCreationForm(forms.UserCreationForm): +class UserCreationForm(admin_forms.UserCreationForm): - error_message = forms.UserCreationForm.error_messages.update( + error_message = admin_forms.UserCreationForm.error_messages.update( {"duplicate_username": _("This username has already been taken.")} ) - class Meta(forms.UserCreationForm.Meta): + class Meta(admin_forms.UserCreationForm.Meta): model = User def clean_username(self): From 5950f4ebe21c119705974658817169fb44d7495e Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 15 Sep 2020 02:16:59 +0000 Subject: [PATCH 243/389] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b32d6d6..460e463e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-14] +### Fixed +- Downgrade Celery to 4.4.6 ([#2829](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2829)) +### Updated +- Update sentry-sdk to 0.17.5 ([#2828](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2828)) +- Update coverage to 5.3 ([#2826](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2826)) +- Update django-storages to 1.10.1 ([#2825](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2825)) + ## [2020-09-12] ### Updated - Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2814)) From a2c4453cf56adba84471875d1b08bb0cb77d7002 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 16 Sep 2020 09:39:02 +0100 Subject: [PATCH 244/389] Fix isort errors --- .../{{cookiecutter.project_slug}}/users/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py index d2170bb3..7d3a296b 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py @@ -1,5 +1,5 @@ -from django.contrib.auth import get_user_model from django.contrib.auth import forms as admin_forms +from django.contrib.auth import get_user_model from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ From fa85682910419511f28827747f872a18956d26c2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Sep 2020 04:28:56 -0700 Subject: [PATCH 245/389] Update pytest-django from 3.9.0 to 3.10.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 9a475e7f..f2f87b38 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,4 +42,4 @@ factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.8 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin -pytest-django==3.9.0 # https://github.com/pytest-dev/pytest-django +pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django From c06869367d8e935c9c38b420afa6cd064d45ef1f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 16 Sep 2020 04:29:06 -0700 Subject: [PATCH 246/389] Update sentry-sdk from 0.17.5 to 0.17.6 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 855a8e29..06731b0b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.5 # https://github.com/getsentry/sentry-python +sentry-sdk==0.17.6 # 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 From d0ef737234b4c9427f71f88f399cf3c20d6a3c77 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 17 Sep 2020 02:16:54 +0000 Subject: [PATCH 247/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 460e463e..b2c3e1e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-16] +### Updated +- Update sentry-sdk to 0.17.6 ([#2833](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2833)) +- Update pytest-django to 3.10.0 ([#2832](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2832)) + ## [2020-09-14] ### Fixed - Downgrade Celery to 4.4.6 ([#2829](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2829)) From ade8aede4745c34d5650f833ba30d671c21972fa Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 17 Sep 2020 15:04:31 -0700 Subject: [PATCH 248/389] Update django-extensions from 3.0.8 to 3.0.9 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index f2f87b38..6536f7f3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -40,6 +40,6 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.0.8 # https://github.com/django-extensions/django-extensions +django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django From 9851fbed6b955553b3e3b7c721de4dad8b0d729c Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 19 Sep 2020 02:16:52 +0000 Subject: [PATCH 249/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2c3e1e4..027408d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-18] +### Updated +- Update django-extensions to 3.0.9 ([#2839](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2839)) + ## [2020-09-16] ### Updated - Update sentry-sdk to 0.17.6 ([#2833](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2833)) From 859766941d44b4d31332f3f4436d4d040adeb733 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Sep 2020 12:27:04 -0700 Subject: [PATCH 250/389] Update django-debug-toolbar from 2.2 to 3.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6536f7f3..0ac95889 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -39,7 +39,7 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==2.2 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.0 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django From 561e9744bfd0ae00688a5a6a383dbb3e9ee37385 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 21 Sep 2020 00:26:05 +0000 Subject: [PATCH 251/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 398ccbf8..d995d5aa 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.5.2 + rev: 5.5.3 hooks: - id: isort From 4f0363acfc86159b7abe9f3a7ad1ec3027d5ad34 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 20 Sep 2020 17:26:14 -0700 Subject: [PATCH 252/389] Update isort from 5.5.2 to 5.5.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f645e14d..717b9826 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.5.2 +isort==5.5.3 flake8==3.8.3 flake8-isort==4.0.0 From b064e09f12cf6b0bd3e54d560eb2eb0227aa86ff Mon Sep 17 00:00:00 2001 From: Arnav Choudhury Date: Mon, 21 Sep 2020 15:50:24 +0530 Subject: [PATCH 253/389] Adding GitHub-Action CI Option (#2837) --- cookiecutter.json | 3 +- docs/project-generation-options.rst | 2 + hooks/post_gen_project.py | 7 ++ tests/test_bare.sh | 2 +- tests/test_cookiecutter_generation.py | 38 ++++++++ .../.github/dependabot.yml | 7 ++ .../.github/workflows/ci.yml | 95 +++++++++++++++++++ 7 files changed, 152 insertions(+), 2 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/.github/dependabot.yml create mode 100644 {{cookiecutter.project_slug}}/.github/workflows/ci.yml diff --git a/cookiecutter.json b/cookiecutter.json index 68206147..4a580036 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -56,7 +56,8 @@ "ci_tool": [ "None", "Travis", - "Gitlab" + "Gitlab", + "Github" ], "keep_local_envs_in_vcs": "y", "debug": "n" diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index ec52e218..8a81e19d 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -119,6 +119,7 @@ ci_tool: 1. None 2. `Travis CI`_ 3. `Gitlab CI`_ + 4. `Github Actions`_ keep_local_envs_in_vcs: Indicates whether the project's ``.envs/.local/`` should be kept in VCS @@ -176,3 +177,4 @@ debug: .. _GitLab CI: https://docs.gitlab.com/ee/ci/ +.. _Github Actions: https://docs.github.com/en/actions diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index fae73e11..ede14c32 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -123,6 +123,10 @@ def remove_dotgitlabciyml_file(): os.remove(".gitlab-ci.yml") +def remove_dotgithub_folder(): + shutil.rmtree(".github") + + def append_to_project_gitignore(path): gitignore_file_path = ".gitignore" with open(gitignore_file_path, "a") as gitignore_file: @@ -395,6 +399,9 @@ def main(): if "{{ cookiecutter.ci_tool }}".lower() != "gitlab": remove_dotgitlabciyml_file() + if "{{ cookiecutter.ci_tool }}".lower() != "github": + remove_dotgithub_folder() + if "{{ cookiecutter.use_drf }}".lower() == "n": remove_drf_starter_files() diff --git a/tests/test_bare.sh b/tests/test_bare.sh index 28f9b7bf..cc1f1c36 100755 --- a/tests/test_bare.sh +++ b/tests/test_bare.sh @@ -1,7 +1,7 @@ #!/bin/sh # this is a very simple script that tests the docker configuration for cookiecutter-django # it is meant to be run from the root directory of the repository, eg: -# sh tests/test_docker.sh +# sh tests/test_bare.sh set -o errexit diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index f9bfcd53..af6e4588 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -96,6 +96,7 @@ SUPPORTED_COMBINATIONS = [ {"ci_tool": "None"}, {"ci_tool": "Travis"}, {"ci_tool": "Gitlab"}, + {"ci_tool": "Github"}, {"keep_local_envs_in_vcs": "y"}, {"keep_local_envs_in_vcs": "n"}, {"debug": "y"}, @@ -138,6 +139,7 @@ def check_paths(paths): @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id) def test_project_generation(cookies, context, context_override): """Test that project is generated and fully rendered.""" + result = cookies.bake(extra_context={**context, **context_override}) assert result.exit_code == 0 assert result.exception is None @@ -225,6 +227,42 @@ def test_gitlab_invokes_flake8_and_pytest( pytest.fail(e) +@pytest.mark.parametrize( + ["use_docker", "expected_test_script"], + [ + ("n", "pytest"), + ("y", "docker-compose -f local.yml exec -T django pytest"), + ], +) +def test_github_invokes_flake8_and_pytest( + cookies, context, use_docker, expected_test_script +): + context.update({"ci_tool": "Github", "use_docker": use_docker}) + result = cookies.bake(extra_context=context) + + assert result.exit_code == 0 + assert result.exception is None + assert result.project.basename == context["project_slug"] + assert result.project.isdir() + + with open(f"{result.project}/.github/workflows/ci.yml", "r") as github_yml: + try: + github_config = yaml.safe_load(github_yml) + flake8_present = False + for action_step in github_config["jobs"]["flake8"]["steps"]: + if action_step.get("run") == "flake8": + flake8_present = True + assert flake8_present + + expected_test_script_present = False + for action_step in github_config["jobs"]["pytest"]["steps"]: + if action_step.get("run") == expected_test_script: + expected_test_script_present = True + assert expected_test_script_present + except yaml.YAMLError as e: + pytest.fail(e) + + @pytest.mark.parametrize("slug", ["project slug", "Project_Slug"]) def test_invalid_slug(cookies, context, slug): """Invalid slug should failed pre-generation hook.""" diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml new file mode 100644 index 00000000..8e8ac866 --- /dev/null +++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + # Update Github actions in workflows + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml new file mode 100644 index 00000000..52818e18 --- /dev/null +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -0,0 +1,95 @@ +name: CI + +# Enable Buildkit and let compose use it to speed up image building +env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + +on: + pull_request: + branches: [ "master" ] + paths-ignore: [ "docs/**" ] + + push: + branches: [ "master" ] + paths-ignore: [ "docs/**" ] + + +jobs: + flake8: + runs-on: ubuntu-latest + steps: + + - name: Checkout Code Repository + uses: actions/checkout@v2 + + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + + - name: Install flake8 + run: | + python -m pip install --upgrade pip + pip install flake8 + + - name: Lint with flake8 + run: flake8 + +# With no caching at all the entire ci process takes 4m 30s to complete! + pytest: + runs-on: ubuntu-latest + steps: + + - name: Checkout Code Repository + uses: actions/checkout@v2 + {% if cookiecutter.use_docker == 'y' -%} + + - name: Build the Stack + run: docker-compose -f local.yml build + + - name: Make DB Migrations + run: docker-compose -f local.yml run --rm django python manage.py migrate + + - name: Run the Stack + run: docker-compose -f local.yml up -d + + - name: Run Django Tests + run: docker-compose -f local.yml exec -T django pytest + + - name: Tear down the Stack + run: docker-compose down + + {%- else %} + + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + + - name: Get pip cache dir + id: pip-cache-location + run: | + echo "::set-output name=dir::$(pip cache dir)" + + {% raw %} + - name: Cache pip Project Dependencies + uses: actions/cache@v2 + with: + # Get the location of pip cache dir + path: ${{ steps.pip-cache-location.outputs.dir }} + # Look to see if there is a cache hit for the corresponding requirements file + key: ${{ runner.os }}-pip-${{ hashFiles('**/local.txt') }} + restore-keys: | + ${{ runner.os }}-pip- + {% endraw %} + + - name: Install Dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements/local.txt + + - name: Test with pytest + run: pytest + + {%- endif %} From e715b8f43dc6a1daef594bbdefeac48ca7f01c3e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 21 Sep 2020 14:13:08 -0700 Subject: [PATCH 254/389] Update django-debug-toolbar from 3.0 to 3.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0ac95889..423ac374 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -39,7 +39,7 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django From c567793453cc28f69ac3e07655ea2b4e2dfc080b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 22 Sep 2020 02:17:28 +0000 Subject: [PATCH 255/389] Update Changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 027408d6..9feac139 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-21] +### Changed +- Adding GitHub-Action CI Option ([#2837](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2837)) +### Updated +- Update django-debug-toolbar to 3.0 ([#2842](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2842)) +- Auto-update pre-commit hooks ([#2843](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2843)) +- Update isort to 5.5.3 ([#2844](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2844)) + ## [2020-09-18] ### Updated - Update django-extensions to 3.0.9 ([#2839](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2839)) From 762f3b3ae2526bfc8ad92413c4a14885ecf005d6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 22 Sep 2020 02:49:28 -0700 Subject: [PATCH 256/389] Update sentry-sdk from 0.17.6 to 0.17.7 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 06731b0b..07ff0c52 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.6 # https://github.com/getsentry/sentry-python +sentry-sdk==0.17.7 # 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 From 1e924fac1696be524f3e1b3a11e9358199c8c543 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 24 Sep 2020 02:17:40 +0000 Subject: [PATCH 257/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9feac139..8efd5341 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-09-23] +### Updated +- Update sentry-sdk to 0.17.7 ([#2847](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2847)) +- Update django-debug-toolbar to 3.1 ([#2846](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2846)) + ## [2020-09-21] ### Changed - Adding GitHub-Action CI Option ([#2837](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2837)) From d5cb85ed9cb5416edc5b45fa1142d1369b8778b2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 24 Sep 2020 10:22:21 -0700 Subject: [PATCH 258/389] Update django-debug-toolbar from 3.1 to 3.1.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 423ac374..04aef19d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -39,7 +39,7 @@ pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.1 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django From 3a32c3b7ce2028c274b08d95a98e3599fbcdb733 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 27 Sep 2020 07:41:24 -0700 Subject: [PATCH 259/389] Update pytest from 6.0.2 to 6.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 717b9826..4410bb3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.0 -pytest==6.0.2 +pytest==6.1.0 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 From 11afe7af59c3229e7e660791ceceb91f3eea51a1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 27 Sep 2020 07:41:24 -0700 Subject: [PATCH 260/389] Update pytest from 6.0.2 to 6.1.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 423ac374..2f4e84b6 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.770 # https://github.com/python/mypy django-stubs==1.5.0 # https://github.com/typeddjango/django-stubs -pytest==6.0.2 # https://github.com/pytest-dev/pytest +pytest==6.1.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation From 6fb51ed49153725a80208f93e770f67089048985 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 28 Sep 2020 12:11:17 -0700 Subject: [PATCH 261/389] Update djangorestframework from 3.11.1 to 3.12.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index c858b733..159a6bc6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -40,6 +40,6 @@ django-compressor==2.4 # https://github.com/django-compressor/django-compressor django-redis==4.12.1 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == "y" %} # Django REST Framework -djangorestframework==3.11.1 # https://github.com/encode/django-rest-framework +djangorestframework==3.12.1 # https://github.com/encode/django-rest-framework django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers {%- endif %} From ae346d4a6f1c4520260c1c26443ac3e7a3989c9a Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 29 Sep 2020 10:50:08 -0700 Subject: [PATCH 262/389] Update sentry-sdk from 0.17.7 to 0.18.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 07ff0c52..34308c0b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.7 # https://github.com/getsentry/sentry-python +sentry-sdk==0.18.0 # 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 From cf26e2d73cacbe03cf7f00b5ae94bb11037eae27 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 30 Sep 2020 00:32:38 -0700 Subject: [PATCH 263/389] Update isort from 5.5.3 to 5.5.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 717b9826..c18e16fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.5.3 +isort==5.5.4 flake8==3.8.3 flake8-isort==4.0.0 From 604325a1c6896f3767937919184d664f55ae3b3c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 30 Sep 2020 06:31:39 -0700 Subject: [PATCH 264/389] Update uvicorn from 0.11.8 to 0.12.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index c858b733..0fc28d81 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn==0.11.8 # https://github.com/encode/uvicorn +uvicorn==0.12.1 # https://github.com/encode/uvicorn {%- endif %} # Django From aa6fd5381394e4d4aa4fa6a0c1e74617561cc457 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2020 00:27:34 +0000 Subject: [PATCH 265/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index d995d5aa..b8e3601f 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.5.3 + rev: 5.5.4 hooks: - id: isort From da850d22170a67a67e570f9d63f654616e260c00 Mon Sep 17 00:00:00 2001 From: Daniel Feldroy Date: Wed, 30 Sep 2020 17:52:33 -0700 Subject: [PATCH 266/389] Update README.rst --- README.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index ec663d3e..64fc521f 100644 --- a/README.rst +++ b/README.rst @@ -110,14 +110,15 @@ This project is run by volunteers. Please support them in their efforts to maint Projects that provide financial support to the maintainers: -Django Crash Course + + ~~~~~~~~~~~~~~~~~~~~~~~~~ -.. image:: https://cdn.shopify.com/s/files/1/0304/6901/files/Django-Crash-Course-300x436.jpg - :name: Django Crash Course: Covers Django 3.0 and Python 3.8 +.. image:: https://cdn.shopify.com/s/files/1/0304/6901/products/Two-Scoops-of-Django-3-Alpha-Cover_540x_26507b15-e489-470b-8a97-02773dd498d1_1080x.jpg + :name: Two Scoops of Django 3.x :align: center - :alt: Django Crash Course - :target: https://www.roygreenfeld.com/products/django-crash-course + :alt: Two Scoops of Django + :target: https://www.feldroy.com/products//two-scoops-of-django-3-x Django Crash Course for Django 3.0 and Python 3.8 is the best cheese-themed Django reference in the universe! From 1a701ed70f3275b282d8fc3a1d98fde36e4e35f5 Mon Sep 17 00:00:00 2001 From: Daniel Feldroy Date: Wed, 30 Sep 2020 17:53:04 -0700 Subject: [PATCH 267/389] Update README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 64fc521f..f964635f 100644 --- a/README.rst +++ b/README.rst @@ -120,7 +120,7 @@ Projects that provide financial support to the maintainers: :alt: Two Scoops of Django :target: https://www.feldroy.com/products//two-scoops-of-django-3-x -Django Crash Course for Django 3.0 and Python 3.8 is the best cheese-themed Django reference in the universe! +Two Scoops of Django 3.x is the best ice cream-themed Django reference in the universe! pyup ~~~~~~~~~~~~~~~~~~ From f98211ae4cb788a644de8211964add2e905099d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2020 06:24:35 +0000 Subject: [PATCH 268/389] Bump actions/setup-python from v2.1.2 to v2.1.3 Bumps [actions/setup-python](https://github.com/actions/setup-python) from v2.1.2 to v2.1.3. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2.1.2...c181ffa198a1248f902bc2f7965d2f9a36c2d7f6) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index f07d1803..99881a78 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.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.2 + - uses: actions/setup-python@v2.1.3 with: python-version: 3.8 diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index ef9263f3..ce930855 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2.1.2 + uses: actions/setup-python@v2.1.3 with: python-version: "3.8" - name: Install dependencies diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index ba7fd74b..0bbc9e0c 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2.1.2 + uses: actions/setup-python@v2.1.3 with: python-version: "3.8" - name: Install dependencies From 58c06e558fd6f455669d624c52bffd5ed16ff6f7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 1 Oct 2020 08:58:53 -0700 Subject: [PATCH 269/389] Update ipdb from 0.13.3 to 0.13.4 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 04aef19d..ebc37fec 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ -r base.txt Werkzeug==1.0.1 # https://github.com/pallets/werkzeug -ipdb==0.13.3 # https://github.com/gotcha/ipdb +ipdb==0.13.4 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg2==2.8.6 # https://github.com/psycopg/psycopg2 {%- else %} From 4225c1b1ab6c4b366e6870635140e8af044847ea Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 1 Oct 2020 17:07:17 +0100 Subject: [PATCH 270/389] Bump mypy and django-stubs versions --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 5a38a438..0fea0b2d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,8 +13,8 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ -mypy==0.770 # https://github.com/python/mypy -django-stubs==1.5.0 # https://github.com/typeddjango/django-stubs +mypy==0.782 # https://github.com/python/mypy +django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs pytest==6.1.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From a9482aec2c0a593a24c82daea04391a7e03a323f Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 1 Oct 2020 18:15:48 +0100 Subject: [PATCH 271/389] Remove placeholders title from issue templates We had a few reports where the title was missing recently --- .github/ISSUE_TEMPLATE/bug.md | 1 - .github/ISSUE_TEMPLATE/feature.md | 1 - .github/ISSUE_TEMPLATE/paid-support.md | 4 ---- .github/ISSUE_TEMPLATE/question.md | 1 - 4 files changed, 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index b2b577f5..757b5990 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -1,7 +1,6 @@ --- name: Bug Report about: Report a bug -title: '[bug]' labels: bug --- diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md index 8cc8141a..ab719770 100644 --- a/.github/ISSUE_TEMPLATE/feature.md +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -1,7 +1,6 @@ --- name: New Feature Proposal about: Propose a new feature -title: '[feature request]' labels: enhancement --- diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md index e553329f..7ebc0647 100644 --- a/.github/ISSUE_TEMPLATE/paid-support.md +++ b/.github/ISSUE_TEMPLATE/paid-support.md @@ -1,10 +1,6 @@ --- name: Paid Support Request about: Ask Core Team members to help you out -title: '' -labels: '' -assignees: '' - --- 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. diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index f24e413f..9d609eb9 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -1,7 +1,6 @@ --- name: Question about: Please consider asking your question on StackOverflow or Slack -title: '[question]' labels: question --- From 6c22376f8eed454110f63b1f846bc29d2943bf86 Mon Sep 17 00:00:00 2001 From: Daniel Feldroy Date: Thu, 1 Oct 2020 11:13:24 -0700 Subject: [PATCH 272/389] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c66e6bc7..ced9c732 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,7 +1,7 @@ # These are supported funding model platforms github: [pydanny, browniebroke] -patreon: roygreenfeld +patreon: feldroy open_collective: # Replace with a single Open Collective username ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel From 689c768abf890e54622c67566b31ab6650fb24d7 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 1 Oct 2020 19:16:22 +0100 Subject: [PATCH 273/389] Fix mypy error users/tests/test_views.py:67: error: unused 'type: ignore' comment --- .../{{cookiecutter.project_slug}}/users/tests/test_views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py index 18b8da7a..3638c8f6 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py @@ -64,7 +64,7 @@ class TestUserDetailView: def test_not_authenticated(self, user: User, rf: RequestFactory): request = rf.get("/fake-url/") - request.user = AnonymousUser() # type: ignore + request.user = AnonymousUser() response = user_detail_view(request, username=user.username) From 26f2a3d7bab30b221780b941cbe0ca97d7ad1207 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 1 Oct 2020 20:01:26 +0100 Subject: [PATCH 274/389] Fix mypy error my_awesome_project/users/admin.py:15: error: No overload variant of "__add__" of "tuple" matches argument type "List[Tuple[Optional[str], _FieldOpts]]" my_awesome_project/users/admin.py:15: note: Possible overload variants: my_awesome_project/users/admin.py:15: note: def __add__(self, Tuple[Tuple[str, Dict[str, Tuple[str]]], ...]) -> Tuple[Tuple[str, Dict[str, Tuple[str]]], ...] my_awesome_project/users/admin.py:15: note: def __add__(self, Tuple[Any, ...]) -> Tuple[Any, ...] my_awesome_project/users/admin.py:15: note: Right operand is of type "Union[Tuple[Tuple[Optional[str], _FieldOpts], ...], List[Tuple[Optional[str], _FieldOpts]]]" --- .../{{cookiecutter.project_slug}}/users/admin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py index cc6efed5..a68a94a9 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py @@ -12,6 +12,8 @@ class UserAdmin(auth_admin.UserAdmin): form = UserChangeForm add_form = UserCreationForm - fieldsets = (("User", {"fields": ("name",)}),) + auth_admin.UserAdmin.fieldsets + fieldsets = (("User", {"fields": ("name",)}),) + tuple( + auth_admin.UserAdmin.fieldsets + ) list_display = ["username", "name", "is_superuser"] search_fields = ["name"] From 77b1d06e8741aebd1bca36a79c645910b6f05b05 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 2 Oct 2020 02:18:14 +0000 Subject: [PATCH 275/389] Update Changelog --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8efd5341..8b25f9d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-01] +### Changed +- Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2869)) +### Updated +- Update ipdb to 0.13.4 ([#2873](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2873)) +- Auto-update pre-commit hooks ([#2867](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2867)) +- Update uvicorn to 0.12.1 ([#2866](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2866)) +- Update isort to 5.5.4 ([#2864](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2864)) +- Update sentry-sdk to 0.18.0 ([#2863](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2863)) +- Update djangorestframework to 3.12.1 ([#2862](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2862)) +- Update pytest to 6.1.0 ([#2859](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2859)) +- Update django-debug-toolbar to 3.1.1 ([#2855](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2855)) + ## [2020-09-23] ### Updated - Update sentry-sdk to 0.17.7 ([#2847](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2847)) From f1e87f264dca62e76f869dd29a70be6082252b3e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 3 Oct 2020 00:26:55 +0000 Subject: [PATCH 276/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index b8e3601f..d341c129 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -21,7 +21,7 @@ repos: - id: isort - repo: https://gitlab.com/pycqa/flake8 - rev: 3.8.3 + rev: 3.8.4 hooks: - id: flake8 args: ['--config=setup.cfg'] From 25f722d41814ab7409e604310d26c7a49bd13df9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 2 Oct 2020 17:27:04 -0700 Subject: [PATCH 277/389] Update flake8 from 3.8.3 to 3.8.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 22fabb17..34a7171d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ binaryornot==0.4.4 # ------------------------------------------------------------------------------ black==20.8b1 isort==5.5.4 -flake8==3.8.3 +flake8==3.8.4 flake8-isort==4.0.0 # Testing From 42b41b7215dcb01cba301279c43bd32048640f02 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 2 Oct 2020 17:27:05 -0700 Subject: [PATCH 278/389] Update flake8 from 3.8.3 to 3.8.4 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0b6308ea..d8f164de 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -25,7 +25,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -flake8==3.8.3 # https://github.com/PyCQA/flake8 +flake8==3.8.4 # https://github.com/PyCQA/flake8 flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort coverage==5.3 # https://github.com/nedbat/coveragepy black==20.8b1 # https://github.com/ambv/black From efeba02853449c8a1a4b6814abc1361d7d3e4ea9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 4 Oct 2020 06:03:31 -0700 Subject: [PATCH 279/389] Update pytest from 6.1.0 to 6.1.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 34a7171d..4dd32a39 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.0 -pytest==6.1.0 +pytest==6.1.1 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 From 6e3f6acf075984cff09b31a690613c801700490c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 4 Oct 2020 06:03:31 -0700 Subject: [PATCH 280/389] Update pytest from 6.1.0 to 6.1.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 11ff8703..1b5467e6 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.782 # https://github.com/python/mypy django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs -pytest==6.1.0 # https://github.com/pytest-dev/pytest +pytest==6.1.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation From d4d1f0c43dd89ecc295be75b078e093bf5bf2f92 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 4 Oct 2020 15:48:52 +0100 Subject: [PATCH 281/389] Test extended Docker with Gulp --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6039075a..bfd008e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: - name: Basic Docker script: sh tests/test_docker.sh - name: Extended Docker - script: sh tests/test_docker.sh use_celery=y use_drf=y + script: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp - name: Bare metal script: sh tests/test_bare.sh use_celery=y use_compressor=y services: From f7bba4401538d8e2dfe67d33e8510dab5fb7b6f8 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 4 Oct 2020 15:56:17 +0100 Subject: [PATCH 282/389] Print commands in bash script --- tests/test_bare.sh | 1 + tests/test_docker.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/test_bare.sh b/tests/test_bare.sh index cc1f1c36..61a66239 100755 --- a/tests/test_bare.sh +++ b/tests/test_bare.sh @@ -4,6 +4,7 @@ # sh tests/test_bare.sh set -o errexit +set -x # Install modern pip to use new resolver: # https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html diff --git a/tests/test_docker.sh b/tests/test_docker.sh index 55771c14..740f8fc2 100755 --- a/tests/test_docker.sh +++ b/tests/test_docker.sh @@ -4,6 +4,7 @@ # sh tests/test_docker.sh set -o errexit +set -x # install test requirements pip install -r requirements.txt From 88b841715623d94bb709aaf1a9722b8a135a2de2 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 5 Oct 2020 02:18:23 +0000 Subject: [PATCH 283/389] Update Changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b25f9d9..f4b064ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-04] +### Updated +- Update pytest to 6.1.1 ([#2880](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2880)) +- Update mypy and django-stubs ([#2874](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2874)) +- Auto-update pre-commit hooks ([#2876](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2876)) +- Update flake8 to 3.8.4 ([#2877](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2877)) + ## [2020-10-01] ### Changed - Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2869)) From 7be855975b65ef55671d3ed2fece6391917416d2 Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Wed, 7 Oct 2020 12:33:00 -0400 Subject: [PATCH 284/389] Add dedicated websockets package Ref: https://github.com/encode/uvicorn/issues/797 There used to be a package automatically installed; not anymore I guess. This came from a separate package and not cookiecutter-django, but the installation was similar. --- {{cookiecutter.project_slug}}/requirements/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 0ea58951..049d7b36 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -25,6 +25,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- if cookiecutter.use_async == 'y' %} uvicorn==0.12.1 # https://github.com/encode/uvicorn +wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ {%- endif %} # Django From c1af517776c22bd7c5460e635d31e8b48467724b Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 8 Oct 2020 00:48:55 -0700 Subject: [PATCH 285/389] Update isort from 5.5.4 to 5.6.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4dd32a39..38913c32 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.5.4 +isort==5.6.0 flake8==3.8.4 flake8-isort==4.0.0 From dd0e03d2fbc8606108a4b569d4ece016a96efe55 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 8 Oct 2020 08:18:42 -0700 Subject: [PATCH 286/389] Update isort from 5.6.0 to 5.6.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 38913c32..7ba0da23 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.6.0 +isort==5.6.1 flake8==3.8.4 flake8-isort==4.0.0 From 90a0b16ae4c318939aa13a971d0bd7dafce22eea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Oct 2020 00:27:59 +0000 Subject: [PATCH 287/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index d341c129..ea21f6a3 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.5.4 + rev: 5.6.1 hooks: - id: isort From d8e62229b60f010a8a346b190c5a8ff7d3b5b3af Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 9 Oct 2020 02:18:57 +0000 Subject: [PATCH 288/389] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4b064ec..5d868da2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-08] +### Changed +- Add dedicated websockets package ([#2881](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2881)) +### Updated +- Update isort to 5.6.0 ([#2882](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2882)) + ## [2020-10-04] ### Updated - Update pytest to 6.1.1 ([#2880](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2880)) From 7a29a427b4880bf8abab7d1f81a554e24ac9e9a1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 01:16:19 -0700 Subject: [PATCH 289/389] Update tox from 3.20.0 to 3.20.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7ba0da23..70c4e049 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ -tox==3.20.0 +tox==3.20.1 pytest==6.1.1 pytest-cookies==0.5.1 pytest-instafail==0.4.2 From 21c69c7d454f5ea4d7aaf218d7e7e27a7f626c51 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 12:09:05 -0700 Subject: [PATCH 290/389] Update mypy from 0.782 to 0.790 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 1b5467e6..27e0ea7a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ -mypy==0.782 # https://github.com/python/mypy +mypy==0.790 # https://github.com/python/mypy django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs pytest==6.1.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From 44689a8be620b48f16e49afcbd4a019102bb6785 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:10:56 -0700 Subject: [PATCH 291/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 34308c0b..da5fbdb2 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -22,7 +22,7 @@ django-storages[boto3]==1.10.1 # https://github.com/jschneier/django-storages django-storages[google]==1.10.1 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==8.0 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} From be74011ba58eeb54f9edaa8b800816b1f9a4c4f1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:10:57 -0700 Subject: [PATCH 292/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index da5fbdb2..29fa37b8 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ django-storages[google]==1.10.1 # https://github.com/jschneier/django-storages {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon_ses]==8.0 # https://github.com/anymail/django-anymail +django-anymail[amazon_ses]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} From dee930cad5fbf01bb76255f049c3fc986d27154d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:10:58 -0700 Subject: [PATCH 293/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 29fa37b8..93270d1a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -26,7 +26,7 @@ django-anymail[mailgun]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} django-anymail[amazon_ses]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==8.0 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} From d0d50fe800cc0bf01ed7738fc48a4eba3c554d1e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:10:58 -0700 Subject: [PATCH 294/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 93270d1a..526f0073 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -28,7 +28,7 @@ django-anymail[amazon_ses]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} django-anymail[mailjet]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==8.0 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} From fa2f09f27d37bc1791d8f26f74b533df615be3fd Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:10:59 -0700 Subject: [PATCH 295/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 526f0073..4a853240 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -30,7 +30,7 @@ django-anymail[mailjet]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} django-anymail[mandrill]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==8.0 # https://github.com/anymail/django-anymail +django-anymail[postmark]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} From ae526ad8dfc9b8b7d883bcf0083c7805108d236e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:11:00 -0700 Subject: [PATCH 296/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 4a853240..bd8508ac 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -32,7 +32,7 @@ django-anymail[mandrill]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} django-anymail[postmark]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==8.0 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} From edd29c3982c50d5c3556162ccf8c9fe9820fb6e6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:11:01 -0700 Subject: [PATCH 297/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index bd8508ac..50e17d8c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -34,7 +34,7 @@ django-anymail[postmark]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} django-anymail[sendgrid]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==8.0 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==8.0 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} From 55a6674d0c583b551ca8acc02d9d5dda97ccb1f9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:11:02 -0700 Subject: [PATCH 298/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 50e17d8c..4461d666 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -36,7 +36,7 @@ django-anymail[sendgrid]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} django-anymail[sendinblue]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==8.0 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} django-anymail==8.0 # https://github.com/anymail/django-anymail {%- endif %} From e043af811a4f3cb6f9d55518f28c001d404e3885 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 9 Oct 2020 13:11:03 -0700 Subject: [PATCH 299/389] Update django-anymail from 8.0 to 8.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 4461d666..8ad3a42c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -38,5 +38,5 @@ django-anymail[sendinblue]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} django-anymail[sparkpost]==8.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==8.0 # https://github.com/anymail/django-anymail +django-anymail==8.1 # https://github.com/anymail/django-anymail {%- endif %} From 53a112b6e40223a702841dc8bc7142c1a64e52be Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 10 Oct 2020 02:19:04 +0000 Subject: [PATCH 300/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d868da2..467503da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-09] +### Updated +- Auto-update pre-commit hooks ([#2884](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2884)) +- Update isort to 5.6.1 ([#2883](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2883)) + ## [2020-10-08] ### Changed - Add dedicated websockets package ([#2881](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2881)) From 8faa1e478bebcde70b8ec062d67e7d5f98fcd60d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 11 Oct 2020 00:29:47 +0000 Subject: [PATCH 301/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index ea21f6a3..8e1b7efb 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.6.1 + rev: 5.6.2 hooks: - id: isort From 5e03f51c5c9b03e48ddf25cc76727c4a30c183b6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 11 Oct 2020 03:05:35 -0700 Subject: [PATCH 302/389] Update isort from 5.6.1 to 5.6.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7ba0da23..2b2f16bb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.6.1 +isort==5.6.3 flake8==3.8.4 flake8-isort==4.0.0 From 62b20fd9068613775fe06a96bcb8a4832129d45e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 00:29:27 +0000 Subject: [PATCH 303/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 8e1b7efb..61534c5a 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.6.2 + rev: 5.6.3 hooks: - id: isort From ea0856f52f8d2e3165cb2810a584e86d1fda350a Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 12 Oct 2020 02:19:53 +0000 Subject: [PATCH 304/389] Update Changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 467503da..a04ec5ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-11] +### Updated +- Auto-update pre-commit hooks ([#2890](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2890)) +- Update isort to 5.6.3 ([#2891](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2891)) +- Update django-anymail to 8.1 ([#2887](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2887)) +- Update tox to 3.20.1 ([#2885](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2885)) + ## [2020-10-09] ### Updated - Auto-update pre-commit hooks ([#2884](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2884)) From 2b5b5a8fb6ca403af2f83eb6710b508dc10c18fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 06:52:07 +0000 Subject: [PATCH 305/389] Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.5.1 to v4.6.0. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.5.1...5c9bfe7477fd67ca1ffc9fed4a69fb7a6a46dcfe) Signed-off-by: dependabot[bot] --- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index ce930855..eded0706 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -28,7 +28,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.5.1 + uses: stefanzweifel/git-auto-commit-action@v4.6.0 with: commit_message: Update Changelog file_pattern: CHANGELOG.md diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 0bbc9e0c..20a8c75c 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -24,7 +24,7 @@ jobs: run: python scripts/update_contributors.py - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.5.1 + uses: stefanzweifel/git-auto-commit-action@v4.6.0 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 5cc1cb2039e5b51484df42cf04628f78d24d02d8 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 13 Oct 2020 02:19:53 +0000 Subject: [PATCH 306/389] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a04ec5ee..4e8480fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-12] +### Changed +- Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2893)) +### Updated +- Auto-update pre-commit hooks ([#2892](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2892)) + ## [2020-10-11] ### Updated - Auto-update pre-commit hooks ([#2890](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2890)) From 8141e29284a1ce9cb2bbe9520d4bcb918bf4bcb0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 13 Oct 2020 02:35:34 -0700 Subject: [PATCH 307/389] Update isort from 5.6.3 to 5.6.4 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 711c4e54..6c04acb9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ black==20.8b1 -isort==5.6.3 +isort==5.6.4 flake8==3.8.4 flake8-isort==4.0.0 From acaeb0d95073b0aa34a49582320e168da82c6a55 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 13 Oct 2020 05:31:37 -0700 Subject: [PATCH 308/389] Update sentry-sdk from 0.18.0 to 0.19.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 8ad3a42c..bb516624 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.18.0 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.0 # 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 From a26d57a6e767f45d071a39890d922665e8aa24c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Oct 2020 00:29:18 +0000 Subject: [PATCH 309/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 61534c5a..5dc5c1c4 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.6.3 + rev: 5.6.4 hooks: - id: isort From fdce700634dff192656bf0516a596096f91f4815 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 14 Oct 2020 02:20:15 +0000 Subject: [PATCH 310/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e8480fc..1727ce13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-13] +### Updated +- Update isort to 5.6.4 ([#2895](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2895)) + ## [2020-10-12] ### Changed - Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2893)) From 4e6cc3ca6012ffeccf4895c2381e2a60976804ce Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 14 Oct 2020 15:58:12 -0700 Subject: [PATCH 311/389] Update pillow from 7.2.0 to 8.0.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 049d7b36..e3fe6b54 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2020.1 # https://github.com/stub42/pytz python-slugify==4.0.1 # https://github.com/un33k/python-slugify -Pillow==7.2.0 # https://github.com/python-pillow/Pillow +Pillow==8.0.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.0.6 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From 19ebbed30a4384b2d80932ceb9801ee5d973cf2d Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 15 Oct 2020 02:20:03 +0000 Subject: [PATCH 312/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1727ce13..6b7e3391 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-14] +### Updated +- Auto-update pre-commit hooks ([#2897](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2897)) +- Update sentry-sdk to 0.19.0 ([#2896](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2896)) + ## [2020-10-13] ### Updated - Update isort to 5.6.4 ([#2895](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2895)) From 7223ab50658024ec821c3c0f60c9bdf9b2fa66ad Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Thu, 15 Oct 2020 12:58:21 +0100 Subject: [PATCH 313/389] Pin official GH actions to the major digit --- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 4 ++-- .github/workflows/update-contributors.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 99881a78..9937cdeb 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.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.3 + - uses: actions/setup-python@v2 with: python-version: 3.8 diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index eded0706..b6e2f4be 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -15,9 +15,9 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2.1.3 + uses: actions/setup-python@v2 with: - python-version: "3.8" + python-version: 3.8 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 20a8c75c..f3999157 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -13,9 +13,9 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v2.1.3 + uses: actions/setup-python@v2 with: - python-version: "3.8" + python-version: 3.8 - name: Install dependencies run: | python -m pip install --upgrade pip From 4ecc00ea6cdd90b55b49b3d77ad6866c36d070d5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 15 Oct 2020 12:30:53 -0700 Subject: [PATCH 314/389] Update django-allauth from 0.42.0 to 0.43.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e3fe6b54..e0045f41 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -33,7 +33,7 @@ wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ django==3.0.10 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils -django-allauth==0.42.0 # https://github.com/pennersr/django-allauth +django-allauth==0.43.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.9.2 # https://github.com/django-crispy-forms/django-crispy-forms {%- if cookiecutter.use_compressor == "y" %} django-compressor==2.4 # https://github.com/django-compressor/django-compressor From 520dcfef36f855071d4082c66a19876fb45ae0b0 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 16 Oct 2020 02:19:55 +0000 Subject: [PATCH 315/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b7e3391..5a777407 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-15] +### Updated +- Update pillow to 8.0.0 ([#2898](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2898)) + ## [2020-10-14] ### Updated - Auto-update pre-commit hooks ([#2897](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2897)) From 58b0359af6458a6b2b4ddf6c16b23cb952bf6630 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 16 Oct 2020 10:36:51 -0700 Subject: [PATCH 316/389] Update pytest-django from 3.10.0 to 4.0.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 1b5467e6..5aaf740b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,4 +42,4 @@ factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin -pytest-django==3.10.0 # https://github.com/pytest-dev/pytest-django +pytest-django==4.0.0 # https://github.com/pytest-dev/pytest-django From 27b005202ddd3480d9d50c3f05dce79190a8ca50 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 18 Oct 2020 02:19:43 +0000 Subject: [PATCH 317/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a777407..700f3c69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-17] +### Updated +- Update django-allauth to 0.43.0 ([#2901](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2901)) +- Update pytest-django to 4.0.0 ([#2903](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2903)) + ## [2020-10-15] ### Updated - Update pillow to 8.0.0 ([#2898](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2898)) From 3d87a420550f75370db3699f209addd890a04cb5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Oct 2020 03:32:37 -0700 Subject: [PATCH 318/389] Update sentry-sdk from 0.19.0 to 0.19.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index bb516624..58714e5c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.19.0 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.1 # 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 From 81c9a4a76ac2c201fa81393d89f70726bad76e88 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Oct 2020 09:13:14 -0700 Subject: [PATCH 319/389] Update uvicorn from 0.12.1 to 0.12.2 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e0045f41..08f8894c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn==0.12.1 # https://github.com/encode/uvicorn +uvicorn==0.12.2 # https://github.com/encode/uvicorn wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ {%- endif %} From 4b97071cfe83c6ef48b5c383b14b8bbbe15c0cb4 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 20 Oct 2020 02:19:25 +0000 Subject: [PATCH 320/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 700f3c69..ccb84bd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-10-19] +### Updated +- Update sentry-sdk to 0.19.1 ([#2905](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2905)) + ## [2020-10-17] ### Updated - Update django-allauth to 0.43.0 ([#2901](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2901)) From 8e229ce0e02f7c15fb1fb9760a38adb2b82b6dc7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 19 Oct 2020 23:39:07 -0700 Subject: [PATCH 321/389] Update django-celery-beat from 2.0.0 to 2.1.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e0045f41..90661fd8 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -18,7 +18,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery -django-celery-beat==2.0.0 # https://github.com/celery/django-celery-beat +django-celery-beat==2.1.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==0.9.5 # https://github.com/mher/flower {%- endif %} From eb400e498034ec1fcb3d8eb8167851588d9cc1ec Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 22 Oct 2020 15:52:32 -0700 Subject: [PATCH 322/389] Update pillow from 8.0.0 to 8.0.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e0045f41..a0dc1aa9 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,6 +1,6 @@ pytz==2020.1 # https://github.com/stub42/pytz python-slugify==4.0.1 # https://github.com/un33k/python-slugify -Pillow==8.0.0 # https://github.com/python-pillow/Pillow +Pillow==8.0.1 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} rcssmin==1.0.6 --install-option="--without-c-extensions" # https://github.com/ndparker/rcssmin From edbc4d3a8c248ab802a34774ddc1c356a5687c35 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 22 Oct 2020 15:52:35 -0700 Subject: [PATCH 323/389] Update pytest-django from 4.0.0 to 4.1.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 5aaf740b..e5d57932 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -42,4 +42,4 @@ factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin -pytest-django==4.0.0 # https://github.com/pytest-dev/pytest-django +pytest-django==4.1.0 # https://github.com/pytest-dev/pytest-django From f2d289588ba1bbe1caf9edfe0e9a7349240dd557 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 24 Oct 2020 11:04:52 -0700 Subject: [PATCH 324/389] Update sh from 1.14.0 to 1.14.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6c04acb9..b53316a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==1.7.2 -sh==1.14.0 +sh==1.14.1 binaryornot==0.4.4 # Code quality From 2b3cd5178935a0534e5e6a8c82d8c5385b1e7b66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Oct 2020 07:10:28 +0000 Subject: [PATCH 325/389] Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.6.0 to v4.7.2. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.6.0...bbd291750d2526367d915d5197485331dc2d8dc7) Signed-off-by: dependabot[bot] --- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index b6e2f4be..0c72c781 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -28,7 +28,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.6.0 + uses: stefanzweifel/git-auto-commit-action@v4.7.2 with: commit_message: Update Changelog file_pattern: CHANGELOG.md diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index f3999157..4ce1c76f 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -24,7 +24,7 @@ jobs: run: python scripts/update_contributors.py - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4.6.0 + uses: stefanzweifel/git-auto-commit-action@v4.7.2 with: commit_message: Update Contributors file_pattern: CONTRIBUTORS.md .github/contributors.json From 9c0f056817bf51b975e3264dbbed12e3af36324c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Oct 2020 02:10:16 -0700 Subject: [PATCH 326/389] Update django-stubs from 1.6.0 to 1.7.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 5aaf740b..5ca2dcdc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # Testing # ------------------------------------------------------------------------------ mypy==0.782 # https://github.com/python/mypy -django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs +django-stubs==1.7.0 # https://github.com/typeddjango/django-stubs pytest==6.1.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar From 21d8bf5fc3b39a4cd723c526b197e123244581fe Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Oct 2020 23:59:02 -0700 Subject: [PATCH 327/389] Update pytest from 6.1.1 to 6.1.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6c04acb9..beb02824 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.1 -pytest==6.1.1 +pytest==6.1.2 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 From 5224641a16797cfb469416f5e96c82612a11239c Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 28 Oct 2020 23:59:03 -0700 Subject: [PATCH 328/389] Update pytest from 6.1.1 to 6.1.2 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 5aaf740b..be0063ee 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchgod==0.6 # https://github.com/samuelcolvin/watchgod # ------------------------------------------------------------------------------ mypy==0.782 # https://github.com/python/mypy django-stubs==1.6.0 # https://github.com/typeddjango/django-stubs -pytest==6.1.1 # https://github.com/pytest-dev/pytest +pytest==6.1.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation From b14a033c8b295dd15085025beebb91a5710ff31f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 30 Oct 2020 15:44:46 -0700 Subject: [PATCH 329/389] Update pre-commit from 2.7.1 to 2.8.2 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 5aaf740b..17d28c4d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.7.1 # https://github.com/pre-commit/pre-commit +pre-commit==2.8.2 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From b86ede6079abeb7adf228b5191526dd38807ae96 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Nov 2020 06:37:16 -0800 Subject: [PATCH 330/389] Update pytz from 2020.1 to 2020.4 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e0045f41..8dcf820f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2020.1 # https://github.com/stub42/pytz +pytz==2020.4 # https://github.com/stub42/pytz python-slugify==4.0.1 # https://github.com/un33k/python-slugify Pillow==8.0.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} From 510ba4ca8a0e2e0537689d9260e61b98afa0abf5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Nov 2020 06:37:19 -0800 Subject: [PATCH 331/389] Update django from 3.0.10 to 3.0.11 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e0045f41..39b3fc2a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -30,7 +30,7 @@ wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ # Django # ------------------------------------------------------------------------------ -django==3.0.10 # pyup: < 3.1 # https://www.djangoproject.com/ +django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils django-allauth==0.43.0 # https://github.com/pennersr/django-allauth From 2bd2e4a8fccb6265be6978e4d27831beeab52009 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Nov 2020 06:37:22 -0800 Subject: [PATCH 332/389] Update sphinx from 3.2.1 to 3.3.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 5aaf740b..7cce652c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.2.1 # https://github.com/sphinx-doc/sphinx +sphinx==3.3.0 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 4a5717c831db7e5731a9b7dda938b25b775df660 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 2 Nov 2020 15:47:08 -0800 Subject: [PATCH 333/389] Update sentry-sdk from 0.19.1 to 0.19.2 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 58714e5c..157ac92a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.19.1 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.2 # 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 From b40a76eb13c88ebfb064db0352cd98ed099889a4 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 3 Nov 2020 23:35:24 +0000 Subject: [PATCH 334/389] Bump template version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8a5b0b8c..c72ba1c9 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ except ImportError: # Our version ALWAYS matches the version of Django we support # If Django has a new release, we branch, tag, then update this setting after the tag. -version = "3.0.10" +version = "3.0.11" if sys.argv[-1] == "tag": os.system(f'git tag -a {version} -m "version {version}"') From 63ea6bca763a2fc272a58e75bea3d07f5c188eba Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2020 00:19:56 +0000 Subject: [PATCH 335/389] Auto-update pre-commit hooks --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 5dc5c1c4..55368bb7 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -4,7 +4,7 @@ fail_fast: true repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v3.3.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer From f99a0af4c0618d774cd7d83e7498a5f8cba11a4d Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 4 Nov 2020 02:14:42 +0000 Subject: [PATCH 336/389] Update Changelog --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccb84bd8..2e802de1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-03] +### Updated +- Update sentry-sdk to 0.19.2 ([#2926](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2926)) +- Update sphinx to 3.3.0 ([#2925](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2925)) +- Update django to 3.0.11 ([#2924](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2924)) +- Update pytz to 2020.4 ([#2923](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2923)) +- Update pre-commit to 2.8.2 ([#2919](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2919)) +- Update pytest to 6.1.2 ([#2917](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2917)) +- Update sh to 1.14.1 ([#2912](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2912)) +- Update pytest-django to 4.1.0 ([#2911](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2911)) +- Update pillow to 8.0.1 ([#2910](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2910)) +- Update django-celery-beat to 2.1.0 ([#2907](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2907)) +- Update uvicorn to 0.12.2 ([#2906](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2906)) + ## [2020-10-19] ### Updated - Update sentry-sdk to 0.19.1 ([#2905](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2905)) From 72da0bfa9cb7897b03a5ebaef3f2ece3d31247db Mon Sep 17 00:00:00 2001 From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> Date: Wed, 4 Nov 2020 12:17:02 -0500 Subject: [PATCH 337/389] Fix docs service and add RTD support (#2920) Co-authored-by: Andrew-Chen-Wang Co-authored-by: Bruno Alla --- docs/document.rst | 19 ++++++++++++++++-- .../.readthedocs.yml | 9 +++++++++ .../compose/local/docs/Dockerfile | 6 ++++-- .../compose/local/docs/start | 7 +++++++ {{cookiecutter.project_slug}}/docs/Makefile | 2 +- {{cookiecutter.project_slug}}/docs/conf.py | 18 ++++++++++++----- .../docs/{_source => }/howto.rst | 0 .../docs/{_source => }/index.rst | 0 .../{_source => }/pycharm/configuration.rst | 0 .../docs/{_source => }/pycharm/images/1.png | Bin .../docs/{_source => }/pycharm/images/2.png | Bin .../docs/{_source => }/pycharm/images/3.png | Bin .../docs/{_source => }/pycharm/images/4.png | Bin .../docs/{_source => }/pycharm/images/7.png | Bin .../docs/{_source => }/pycharm/images/8.png | Bin .../docs/{_source => }/pycharm/images/f1.png | Bin .../docs/{_source => }/pycharm/images/f2.png | Bin .../docs/{_source => }/pycharm/images/f3.png | Bin .../docs/{_source => }/pycharm/images/f4.png | Bin .../{_source => }/pycharm/images/issue1.png | Bin .../{_source => }/pycharm/images/issue2.png | Bin .../docs/{_source => }/users.rst | 0 {{cookiecutter.project_slug}}/local.yml | 3 ++- 23 files changed, 53 insertions(+), 11 deletions(-) create mode 100644 {{cookiecutter.project_slug}}/.readthedocs.yml create mode 100644 {{cookiecutter.project_slug}}/compose/local/docs/start rename {{cookiecutter.project_slug}}/docs/{_source => }/howto.rst (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/index.rst (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/configuration.rst (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/1.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/2.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/3.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/4.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/7.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/8.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f1.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f2.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f3.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f4.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/issue1.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/issue2.png (100%) rename {{cookiecutter.project_slug}}/docs/{_source => }/users.rst (100%) diff --git a/docs/document.rst b/docs/document.rst index 15a5396e..a3097909 100644 --- a/docs/document.rst +++ b/docs/document.rst @@ -15,15 +15,30 @@ If you set up your project to `develop locally with docker`_, run the following Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development. +Note: using Docker for documentation sets up a temporary SQLite file by setting the environment variable ``DATABASE_URL=sqlite:///readthedocs.db`` in ``docs/conf.py`` to avoid a dependency on PostgreSQL. + Generate API documentation ---------------------------- -Edit the ``docs/_source`` files and project application docstrings to create your documentation. +Edit the ``docs`` files and project application docstrings to create your documentation. -Sphinx can automatically include class and function signatures and docstrings in generated documentation. +Sphinx can automatically include class and function signatures and docstrings in generated documentation. See the generated project documentation for more examples. +Setting up ReadTheDocs +---------------------- + +To setup your documentation on `ReadTheDocs`_, you must + +1. Go to `ReadTheDocs`_ and login/create an account +2. Add your GitHub repository +3. Trigger a build + +Additionally, you can auto-build Pull Request previews, but `you must enable it`_. + .. _localhost: http://localhost:7000/ .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html .. _develop locally: ./developing-locally.html .. _develop locally with docker: ./developing-locally-docker.html +.. _ReadTheDocs: https://readthedocs.org/ +.. _you must enable it: https://docs.readthedocs.io/en/latest/guides/autobuild-docs-for-pull-requests.html#autobuild-documentation-for-pull-requests diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml new file mode 100644 index 00000000..b193a85e --- /dev/null +++ b/{{cookiecutter.project_slug}}/.readthedocs.yml @@ -0,0 +1,9 @@ +version: 2 + +sphinx: + configuration: docs/conf.py + +python: + version: 3.8 + install: + - requirements: requirements/local.txt diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index 7736777b..315fdd40 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -24,6 +24,8 @@ COPY ./requirements /requirements # All imports needed for autodoc. RUN pip install -r /requirements/local.txt -r /requirements/production.txt -WORKDIR /docs +COPY ./compose/local/docs/start /start-docs +RUN sed -i 's/\r$//g' /start-docs +RUN chmod +x /start-docs -CMD make livehtml +WORKDIR /docs diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/start b/{{cookiecutter.project_slug}}/compose/local/docs/start new file mode 100644 index 00000000..fd2e0de6 --- /dev/null +++ b/{{cookiecutter.project_slug}}/compose/local/docs/start @@ -0,0 +1,7 @@ +#!/bin/bash + +set -o errexit +set -o pipefail +set -o nounset + +make livehtml diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile index 4f772cad..0b56e1f8 100644 --- a/{{cookiecutter.project_slug}}/docs/Makefile +++ b/{{cookiecutter.project_slug}}/docs/Makefile @@ -5,7 +5,7 @@ # from the environment for the first two. SPHINXOPTS ?= SPHINXBUILD ?= sphinx-build -c . -SOURCEDIR = ./_source +SOURCEDIR = . BUILDDIR = ./_build {%- if cookiecutter.use_docker == 'y' %} APP = /app diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py index 691f351e..c640e1c6 100644 --- a/{{cookiecutter.project_slug}}/docs/conf.py +++ b/{{cookiecutter.project_slug}}/docs/conf.py @@ -14,11 +14,19 @@ import os import sys import django -{% if cookiecutter.use_docker == 'y' %} -sys.path.insert(0, os.path.abspath("/app")) -os.environ.setdefault("DATABASE_URL", "") -{% else %} -sys.path.insert(0, os.path.abspath("..")) +if os.getenv("READTHEDOCS", default=False) == "True": + sys.path.insert(0, os.path.abspath("..")) + os.environ["DJANGO_READ_DOT_ENV_FILE"] = "True" + os.environ["USE_DOCKER"] = "no" +else: +{%- if cookiecutter.use_docker == 'y' %} + sys.path.insert(0, os.path.abspath("/app")) +{%- else %} + sys.path.insert(0, os.path.abspath("..")) +{%- endif %} +os.environ["DATABASE_URL"] = "sqlite:///readthedocs.db" +{%- if cookiecutter.use_celery == 'y' %} +os.environ["CELERY_BROKER_URL"] = os.getenv("REDIS_URL", "redis://redis:6379") {%- endif %} os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") django.setup() diff --git a/{{cookiecutter.project_slug}}/docs/_source/howto.rst b/{{cookiecutter.project_slug}}/docs/howto.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/howto.rst rename to {{cookiecutter.project_slug}}/docs/howto.rst diff --git a/{{cookiecutter.project_slug}}/docs/_source/index.rst b/{{cookiecutter.project_slug}}/docs/index.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/index.rst rename to {{cookiecutter.project_slug}}/docs/index.rst diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst rename to {{cookiecutter.project_slug}}/docs/pycharm/configuration.rst diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/1.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/2.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/3.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/3.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/4.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/4.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/7.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/7.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/8.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/8.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f1.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f2.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f3.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f3.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f4.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f4.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png rename to {{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png diff --git a/{{cookiecutter.project_slug}}/docs/_source/users.rst b/{{cookiecutter.project_slug}}/docs/users.rst similarity index 100% rename from {{cookiecutter.project_slug}}/docs/_source/users.rst rename to {{cookiecutter.project_slug}}/docs/users.rst diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index a6cbe543..e285f349 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -51,7 +51,8 @@ services: - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z ports: - "7000:7000" - + command: /start-docs + {%- if cookiecutter.use_mailhog == 'y' %} mailhog: From f8a239d4f9844031792993c085be2e13b67dbb10 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 5 Nov 2020 02:15:30 +0000 Subject: [PATCH 338/389] Update Changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e802de1..3748e8c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-04] +### Changed +- Fix docs service and add RTD support ([#2920](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2920)) +- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2914)) +### Updated +- Auto-update pre-commit hooks ([#2908](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2908)) +- Update mypy to 0.790 ([#2886](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2886)) +- Update django-stubs to 1.7.0 ([#2916](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2916)) + ## [2020-11-03] ### Updated - Update sentry-sdk to 0.19.2 ([#2926](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2926)) From 3750aff3949eb2b77cf41dfd37978623863bd619 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 5 Nov 2020 17:50:07 -0800 Subject: [PATCH 339/389] Update djangorestframework from 3.12.1 to 3.12.2 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8b9af7a2..ca92f81a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,6 +41,6 @@ django-compressor==2.4 # https://github.com/django-compressor/django-compressor django-redis==4.12.1 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == "y" %} # Django REST Framework -djangorestframework==3.12.1 # https://github.com/encode/django-rest-framework +djangorestframework==3.12.2 # https://github.com/encode/django-rest-framework django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers {%- endif %} From 041ecb0fc648378fd4570e6cb02f9800efb6845f Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 7 Nov 2020 02:15:42 +0000 Subject: [PATCH 340/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3748e8c1..ffc571c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-06] +### Updated +- Update djangorestframework to 3.12.2 ([#2930](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2930)) + ## [2020-11-04] ### Changed - Fix docs service and add RTD support ([#2920](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2920)) From 1abfd539e398516130944891660eb8959c22e7b7 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 18:46:19 +0000 Subject: [PATCH 341/389] Basic CI workflow using github actions --- .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++ .travis.yml | 36 ------------------------------------ 2 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..eb1aeec4 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,33 @@ +name: CI + +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + script: + - name: Test results + run: tox -e py38 + - name: Black template + run: tox -e black-template + - name: Basic Docker + run: sh tests/test_docker.sh + - name: Extended Docker + run: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp + - name: Bare metal + run: sh tests/test_bare.sh use_celery=y use_compressor=y + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install dependencies + run: | + python -m pip install -U pip + python -m pip install -U tox + - name: ${{ matrix.script.name }} + run: ${{ matrix.script.run }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bfd008e7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -services: - - docker - -language: python - -python: 3.8 - -before_install: - - docker-compose -v - - docker -v - -matrix: - include: - - name: Test results - script: tox -e py38 - - name: Black template - script: tox -e black-template - - name: Basic Docker - script: sh tests/test_docker.sh - - name: Extended Docker - script: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp - - name: Bare metal - script: sh tests/test_bare.sh use_celery=y use_compressor=y - services: - - postgresql - - redis-server - env: - - CELERY_BROKER_URL=redis://localhost:6379/0 - -install: - - pip install tox - -notifications: - email: - on_success: change - on_failure: always From 0a56c9c9b9157db28dbe2427dd7a85acebe8e260 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:01:29 +0000 Subject: [PATCH 342/389] Split out workflow to add services for bare metal tests --- .github/workflows/ci.yml | 69 ++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb1aeec4..3785ec7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,22 +3,14 @@ name: CI on: [push, pull_request] jobs: - test: + tox: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - script: - - name: Test results - run: tox -e py38 - - name: Black template - run: tox -e black-template - - name: Basic Docker - run: sh tests/test_docker.sh - - name: Extended Docker - run: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp - - name: Bare metal - run: sh tests/test_bare.sh use_celery=y use_compressor=y + tox-env: + - py38 + - black-template steps: - uses: actions/checkout@v2 @@ -29,5 +21,54 @@ jobs: run: | python -m pip install -U pip python -m pip install -U tox - - name: ${{ matrix.script.name }} - run: ${{ matrix.script.run }} + - name: Tox ${{ matrix.tox-env }} + run: tox -e ${{ matrix.tox-env }} + + docker: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + script: + - name: Basic + args: "" + - name: Extended + args: "use_celery=y use_drf=y js_task_runner=Gulp" + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Docker ${{ matrix.script.name }} + run: sh tests/test_docker.sh ${{ matrix.script.args }} + + bare: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + script: + - name: With Celery + args: "use_celery=y use_compressor=y" + + services: + redis: + image: redis + ports: + - 6379:6379 + postgres: + image: postgres + env: + POSTGRES_PASSWORD: postgres + + env: + CELERY_BROKER_URL: "redis://localhost:6379/0" + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Bare Metal ${{ matrix.script.name }} + run: sh tests/test_bare.sh ${{ matrix.script.args }} From 56268ec82c4b8969cefd2a87511fbfb15483ec4d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:06:49 +0000 Subject: [PATCH 343/389] Pin service images, expose DB ports and don't set PG password --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3785ec7c..32eaa054 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,13 +54,13 @@ jobs: services: redis: - image: redis + image: redis:5.0 ports: - 6379:6379 postgres: - image: postgres - env: - POSTGRES_PASSWORD: postgres + image: postgres:12 + ports: + - 5432:5432 env: CELERY_BROKER_URL: "redis://localhost:6379/0" From a625327226e77839b39865e484c8b2ce5a02f55e Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:18:38 +0000 Subject: [PATCH 344/389] Set some environment variables --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32eaa054..6bc0966b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,10 @@ jobs: - name: Extended args: "use_celery=y use_drf=y js_task_runner=Gulp" + env: + DOCKER_BUILDKIT: 1 + COMPOSE_DOCKER_CLI_BUILD: 1 + steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -64,6 +68,7 @@ jobs: env: CELERY_BROKER_URL: "redis://localhost:6379/0" + DATABASE_URL: "postgres://postgres" steps: - uses: actions/checkout@v2 From c3d644083052025d05f27f8e786296349990dbc5 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:23:48 +0000 Subject: [PATCH 345/389] Explicit DATABASE_URL --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6bc0966b..a943bfba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,10 +65,13 @@ jobs: image: postgres:12 ports: - 5432:5432 + env: + POSTGRES_PASSWORD: postgres env: CELERY_BROKER_URL: "redis://localhost:6379/0" - DATABASE_URL: "postgres://postgres" + # postgres://user:password@host:port/database + DATABASE_URL: "postgres://postgres:postgres@postgres:5432/postgres" steps: - uses: actions/checkout@v2 From 2233de8566830bbca8d02a5fe20a183831801823 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:28:09 +0000 Subject: [PATCH 346/389] Connect to PG on localhost --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a943bfba..fb26dd8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: env: CELERY_BROKER_URL: "redis://localhost:6379/0" # postgres://user:password@host:port/database - DATABASE_URL: "postgres://postgres:postgres@postgres:5432/postgres" + DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres" steps: - uses: actions/checkout@v2 From 1e6104ce723809ff758a4b24967bb20dca75f762 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:31:40 +0000 Subject: [PATCH 347/389] Update badge --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index f964635f..dbc510a4 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,8 @@ Cookiecutter Django -======================= +=================== -.. image:: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master - :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master +.. image:: https://img.shields.io/github/workflow/status/pydanny/cookiecutter-django/CI/master + :target: https://github.com/pydanny/cookiecutter-django/actions?query=workflow%3ACI :alt: Build Status .. image:: https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest From 46a0b60a29d34d3b8654382408541a0c52b890e6 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 9 Nov 2020 19:38:16 +0000 Subject: [PATCH 348/389] Ignore pushes to non-master branch to avoid double builds --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb26dd8e..fd966845 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,9 @@ name: CI -on: [push, pull_request] +on: + push: + branches: [ master ] + pull_request: jobs: tox: From 9f3117c61579a6413fc272ddd450a02d79467e2a Mon Sep 17 00:00:00 2001 From: umgelurgel Date: Thu, 12 Nov 2020 18:53:29 +0100 Subject: [PATCH 349/389] Upgrade factory-boy to 3.1.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- .../{{cookiecutter.project_slug}}/users/tests/factories.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b57268c7..ccde790a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,7 @@ pre-commit==2.8.2 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ -factory-boy==3.0.1 # https://github.com/FactoryBoy/factory_boy +factory-boy==3.1.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py index 1a78f132..05b3ae0b 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py @@ -23,7 +23,7 @@ class UserFactory(DjangoModelFactory): digits=True, upper_case=True, lower_case=True, - ).generate(extra_kwargs={}) + ).generate(params={"locale": None}) ) self.set_password(password) From aaaa26494a0ed546d6a8e87e86b3e75f1177eab9 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 12 Nov 2020 13:10:42 -0800 Subject: [PATCH 350/389] Update sentry-sdk from 0.19.2 to 0.19.3 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 157ac92a..12e4bd85 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.19.2 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.3 # 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 From eca1f45564cc58cdc19cb813b551776fa765e0f2 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 12 Nov 2020 13:10:45 -0800 Subject: [PATCH 351/389] Update sphinx from 3.3.0 to 3.3.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index b57268c7..cf505bb4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar # Documentation # ------------------------------------------------------------------------------ -sphinx==3.3.0 # https://github.com/sphinx-doc/sphinx +sphinx==3.3.1 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild # Code quality From 22ad82b24e29fc3cbcbdca20168b6fecde246313 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 13 Nov 2020 02:15:12 +0000 Subject: [PATCH 352/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffc571c7..51a6149a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-12] +### Changed +- Migrate CI to Github Actions ([#2931](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2931)) + ## [2020-11-06] ### Updated - Update djangorestframework to 3.12.2 ([#2930](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2930)) From 94130f9c56a5eea22a5d0f7653cb88a64fb50eeb Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 13 Nov 2020 10:00:15 +0000 Subject: [PATCH 353/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 4f2f96df..3ecf0223 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1037,5 +1037,10 @@ "name": "Wes Turner", "github_login": "westurner", "twitter_username": "westurner" + }, + { + "name": "Jakub Musko", + "github_login": "umgelurgel", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e0fda25e..642a6ba9 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -796,6 +796,13 @@ Listed in alphabetical order. + + Jakub Musko + + umgelurgel + + + James Williams From 23b6c0d61f3417688b8a8dc278d2a2f339d20901 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 14 Nov 2020 02:15:20 +0000 Subject: [PATCH 354/389] Update Changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51a6149a..da70c8c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-13] +### Changed +- Upgrade factory-boy to 3.1.0 ([#2932](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2932)) +### Updated +- Update sentry-sdk to 0.19.3 ([#2933](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2933)) +- Update sphinx to 3.3.1 ([#2934](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2934)) + ## [2020-11-12] ### Changed - Migrate CI to Github Actions ([#2931](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2931)) From 4b9002d7db8d278f455b1b7915febf0bdfd6dc9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Nov 2020 22:10:36 +0100 Subject: [PATCH 355/389] Fix formatting --- docs/developing-locally.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 0da26548..2b7806ce 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -34,10 +34,10 @@ First things first. $ git init # A git repo is required for pre-commit to install $ pre-commit install - .. note:: + .. note:: - the `pre-commit` exists in the generated project as default. - for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/). + the `pre-commit` exists in the generated project as default. + for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/). #. Create a new PostgreSQL database using createdb_: :: From 4ffa344592c4c76fc959d0de69b307a8dfcf3fc5 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 15 Nov 2020 00:30:23 +0000 Subject: [PATCH 356/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 3ecf0223..38ab437e 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1042,5 +1042,10 @@ "name": "Jakub Musko", "github_login": "umgelurgel", "twitter_username": "" + }, + { + "name": "Fabian Affolter", + "github_login": "fabaff", + "twitter_username": "fabaff" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 642a6ba9..8ccbf18e 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -656,6 +656,13 @@ Listed in alphabetical order. + + Fabian Affolter + + fabaff + + fabaff + Felipe Arruda From ecc46a36c43b475801d421821feb5b725c9c2697 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 16 Nov 2020 02:15:38 +0000 Subject: [PATCH 357/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da70c8c6..66876897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-15] +### Changed +- Fix formatting in docs ([#2935](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2935)) + ## [2020-11-13] ### Changed - Upgrade factory-boy to 3.1.0 ([#2932](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2932)) From 1ab82a0e33d591cf23855984cd3253f0b756a07a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2020 06:16:21 +0000 Subject: [PATCH 358/389] Bump peter-evans/create-pull-request from v2 to v3.5.0 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v2 to v3.5.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v2...ff0beed1b2103611f5bdb7dfb1b23956763bf79a) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 9937cdeb..c81a25a7 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -26,7 +26,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v2 + uses: peter-evans/create-pull-request@v3.5.0 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 9439c82e60f178b4bafb3f6b920ad9be8c0f9168 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 18 Nov 2020 02:16:09 +0000 Subject: [PATCH 359/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66876897..2e6d7c37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-17] +### Changed +- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2936)) + ## [2020-11-15] ### Changed - Fix formatting in docs ([#2935](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2935)) From e649b76ec9d045f288e08ac751b501e72c856c77 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 18 Nov 2020 13:53:32 -0800 Subject: [PATCH 360/389] Update django-crispy-forms from 1.9.2 to 1.10.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index ca92f81a..a65825f2 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -34,7 +34,7 @@ django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils django-allauth==0.43.0 # https://github.com/pennersr/django-allauth -django-crispy-forms==1.9.2 # https://github.com/django-crispy-forms/django-crispy-forms +django-crispy-forms==1.10.0 # https://github.com/django-crispy-forms/django-crispy-forms {%- if cookiecutter.use_compressor == "y" %} django-compressor==2.4 # https://github.com/django-compressor/django-compressor {%- endif %} From a02aba44e7683a0852f03e28b01aeeb1ce8d7207 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 19 Nov 2020 10:39:39 -0800 Subject: [PATCH 361/389] Update sentry-sdk from 0.19.3 to 0.19.4 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 12e4bd85..38e5ec86 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.19.3 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.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 From 88f6150c5d1a40c0a119f3909339bc9f3d9481df Mon Sep 17 00:00:00 2001 From: Simon Rey <51708585+eqqe@users.noreply.github.com> Date: Thu, 19 Nov 2020 20:16:56 +0100 Subject: [PATCH 362/389] Fix after uvicorn 0.12.0 - Ship extra dependencies Uvicorn no longer ships extra dependencies uvloop, websockets and httptools as default. To install these dependencies use uvicorn[standard]. cf https://github.com/encode/uvicorn/blob/master/CHANGELOG.md --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index a65825f2..d0630a6d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn==0.12.2 # https://github.com/encode/uvicorn +uvicorn[standard]==0.12.2 # https://github.com/encode/uvicorn wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ {%- endif %} From a6b637841665daff0d00e384febbf14210c9c2c1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 20 Nov 2020 02:16:46 +0000 Subject: [PATCH 363/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e6d7c37..c0636762 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-19] +### Updated +- Update django-crispy-forms to 1.10.0 ([#2937](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2937)) + ## [2020-11-17] ### Changed - Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2936)) From a30b604a25b9fc32976b31473faeaa764c8342f5 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 21 Nov 2020 02:16:33 +0000 Subject: [PATCH 364/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0636762..3dbb31b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-20] +### Updated +- Update sentry-sdk to 0.19.4 ([#2938](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2938)) + ## [2020-11-19] ### Updated - Update django-crispy-forms to 1.10.0 ([#2937](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2937)) From f02c57bf3ebba0647c7fe8ca35aaf54867c7f402 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sat, 21 Nov 2020 11:44:46 +0000 Subject: [PATCH 365/389] Remove wsproto --- {{cookiecutter.project_slug}}/requirements/base.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index d0630a6d..64cb3e0f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -25,7 +25,6 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- if cookiecutter.use_async == 'y' %} uvicorn[standard]==0.12.2 # https://github.com/encode/uvicorn -wsproto==0.15.0 # https://github.com/python-hyper/wsproto/ {%- endif %} # Django From 6e932a48b82c34cd7bbf0d40074bc5bc6286d5d8 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 21 Nov 2020 11:49:57 +0000 Subject: [PATCH 366/389] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 38ab437e..25a33ed5 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1047,5 +1047,10 @@ "name": "Fabian Affolter", "github_login": "fabaff", "twitter_username": "fabaff" + }, + { + "name": "Simon Rey", + "github_login": "eqqe", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8ccbf18e..6649f3fd 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1286,6 +1286,13 @@ Listed in alphabetical order. saschalalala + + Simon Rey + + eqqe + + + Sorasful From 132a6f0be2a8b66677809bef25e550531d011ec7 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 21 Nov 2020 15:37:47 -0800 Subject: [PATCH 367/389] Update pre-commit from 2.8.2 to 2.9.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 0847e6b2..368dc5bd 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.8.2 # https://github.com/pre-commit/pre-commit +pre-commit==2.9.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 4d6a2b9a1746b4cab0fd20c4cb40f07561858945 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 22 Nov 2020 02:16:48 +0000 Subject: [PATCH 368/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dbb31b1..800de5fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-21] +### Changed +- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2939)) + ## [2020-11-20] ### Updated - Update sentry-sdk to 0.19.4 ([#2938](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2938)) From 90d71f424d0333c2847d21b1bff8b59bbdf0ea13 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 22 Nov 2020 02:00:45 -0800 Subject: [PATCH 369/389] Update uvicorn from 0.12.2 to 0.12.3 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 64cb3e0f..eea7fe65 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ flower==0.9.5 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.12.2 # https://github.com/encode/uvicorn +uvicorn[standard]==0.12.3 # https://github.com/encode/uvicorn {%- endif %} # Django From 48011f7422d26e1561e59156960c87a0806f0227 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Tue, 24 Nov 2020 02:17:31 +0000 Subject: [PATCH 370/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 800de5fd..faa102b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-23] +### Updated +- Update uvicorn to 0.12.3 ([#2943](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2943)) +- Update pre-commit to 2.9.0 ([#2942](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2942)) + ## [2020-11-21] ### Changed - Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2939)) From b47678a2e84774d9834c103dab49278888ffb568 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Nov 2020 05:47:41 +0000 Subject: [PATCH 371/389] Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.5.0 to v3.5.1. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.5.0...ce699aa2d108e9d04fde047a71e44b2bf444b6dc) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index c81a25a7..f471eacf 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -26,7 +26,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.5.0 + uses: peter-evans/create-pull-request@v3.5.1 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From 4e978361097c652e8089b3c45e0bb8f88be4f106 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 25 Nov 2020 11:27:41 -0800 Subject: [PATCH 372/389] Update django-allauth from 0.43.0 to 0.44.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index eea7fe65..502928f6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.12.3 # https://github.com/encode/uvicorn django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils -django-allauth==0.43.0 # https://github.com/pennersr/django-allauth +django-allauth==0.44.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.10.0 # https://github.com/django-crispy-forms/django-crispy-forms {%- if cookiecutter.use_compressor == "y" %} django-compressor==2.4 # https://github.com/django-compressor/django-compressor From c33d0f278c0bcd8271927184e5fe0a7e2aa4c4ed Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 25 Nov 2020 15:33:56 -0800 Subject: [PATCH 373/389] Update django-extensions from 3.0.9 to 3.1.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 368dc5bd..5df8e4ae 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -40,6 +40,6 @@ pre-commit==2.9.0 # https://github.com/pre-commit/pre-commit factory-boy==3.1.0 # https://github.com/FactoryBoy/factory_boy django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar -django-extensions==3.0.9 # https://github.com/django-extensions/django-extensions +django-extensions==3.1.0 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.1.0 # https://github.com/pytest-dev/pytest-django From 3335ee70b451d968ca487cf4707740619bc6574b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 26 Nov 2020 02:17:43 +0000 Subject: [PATCH 374/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index faa102b0..fc617aa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-25] +### Changed +- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2944)) + ## [2020-11-23] ### Updated - Update uvicorn to 0.12.3 ([#2943](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2943)) From f63a434d727627af7bfdc622ce538cb12d810891 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 25 Nov 2020 20:33:51 -0800 Subject: [PATCH 375/389] Update pre-commit from 2.9.0 to 2.9.2 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 368dc5bd..464dc80e 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.9.0 # https://github.com/pre-commit/pre-commit +pre-commit==2.9.2 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From bb0c68317cb71bf0ce8095452d815c04fbd1db34 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 27 Nov 2020 02:17:48 +0000 Subject: [PATCH 376/389] Update Changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc617aa7..c203da3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-11-26] +### Updated +- Update django-extensions to 3.1.0 ([#2947](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2947)) +- Update pre-commit to 2.9.2 ([#2948](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2948)) +- Update django-allauth to 0.44.0 ([#2945](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2945)) + ## [2020-11-25] ### Changed - Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2944)) From 5ad419e3223fb0b2b4c8e14d80297d521ff92dea Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 2 Dec 2020 13:58:05 +0000 Subject: [PATCH 377/389] Fixes for pip 20.3 --- requirements.txt | 2 +- tests/test_bare.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9f5d0365..f65d4563 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.1 -pytest==6.1.2 +pytest==5.4.3 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 diff --git a/tests/test_bare.sh b/tests/test_bare.sh index 61a66239..eae09dc7 100755 --- a/tests/test_bare.sh +++ b/tests/test_bare.sh @@ -6,9 +6,9 @@ set -o errexit set -x -# Install modern pip to use new resolver: -# https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html -pip install 'pip>=20.2' +# Install modern pip with new resolver: +# https://blog.python.org/2020/11/pip-20-3-release-new-resolver.html +pip install 'pip>=20.3' # install test requirements pip install -r requirements.txt @@ -25,7 +25,7 @@ cd my_awesome_project sudo utility/install_os_dependencies.sh install # Install Python deps -pip install --use-feature=2020-resolver -r requirements/local.txt +pip install -r requirements/local.txt # run the project's tests pytest From 092416147ca3c6c9f3e3a3e924a1a44867cde076 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 2 Dec 2020 14:02:54 +0000 Subject: [PATCH 378/389] Pin django-timezone-field==4.0 refs #2950 --- {{cookiecutter.project_slug}}/requirements/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 502928f6..8e870184 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -19,6 +19,7 @@ hiredis==1.1.0 # https://github.com/redis/hiredis-py {%- if cookiecutter.use_celery == "y" %} celery==4.4.6 # pyup: < 5.0,!=4.4.7 # https://github.com/celery/celery django-celery-beat==2.1.0 # https://github.com/celery/django-celery-beat +django-timezone-field==4.0 # https://github.com/celery/django-celery-beat/pull/378 {%- if cookiecutter.use_docker == 'y' %} flower==0.9.5 # https://github.com/mher/flower {%- endif %} From 549274d699dca42125a3f9538fd99378cb30e0b5 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Dec 2020 06:09:49 -0800 Subject: [PATCH 379/389] Update django-model-utils from 4.0.0 to 4.1.1 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8e870184..9b090069 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -32,7 +32,7 @@ uvicorn[standard]==0.12.3 # https://github.com/encode/uvicorn # ------------------------------------------------------------------------------ django==3.0.11 # pyup: < 3.1 # https://www.djangoproject.com/ django-environ==0.4.5 # https://github.com/joke2k/django-environ -django-model-utils==4.0.0 # https://github.com/jazzband/django-model-utils +django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils django-allauth==0.44.0 # https://github.com/pennersr/django-allauth django-crispy-forms==1.10.0 # https://github.com/django-crispy-forms/django-crispy-forms {%- if cookiecutter.use_compressor == "y" %} From 1b02e8c90ddcf766b937172fac613ce5e380a150 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 2 Dec 2020 14:14:34 +0000 Subject: [PATCH 380/389] PyUP filter for pytest <6 in template --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f65d4563..02842d2d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ flake8-isort==4.0.0 # Testing # ------------------------------------------------------------------------------ tox==3.20.1 -pytest==5.4.3 +pytest==5.4.3 # pyup: <6 # https://github.com/hackebrot/pytest-cookies/issues/51 pytest-cookies==0.5.1 pytest-instafail==0.4.2 pyyaml==5.3.1 From b2a34f57cdc9e42d68620dd29e2fc177e73a367d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Dec 2020 06:17:15 -0800 Subject: [PATCH 381/389] Update pygithub from 1.53 to 1.54 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 02842d2d..482b0076 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,5 +19,5 @@ pyyaml==5.3.1 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.53 +PyGithub==1.54 jinja2==2.11.2 From 1164d9cbcb5960046d1dce4331912f58c9b6d3d6 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 3 Dec 2020 02:18:33 +0000 Subject: [PATCH 382/389] Update Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c203da3b..ed700575 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-02] +### Updated +- Update django-model-utils to 4.1.1 ([#2957](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2957)) +- Update pygithub to 1.54 ([#2958](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2958)) + ## [2020-11-26] ### Updated - Update django-extensions to 3.1.0 ([#2947](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2947)) From 9d6f661d4042b3f3c355f7c559f45bb7c62fa2d1 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 3 Dec 2020 03:59:51 -0800 Subject: [PATCH 383/389] Update django-debug-toolbar from 3.1.1 to 3.2 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 466bef14..8eea2149 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -39,7 +39,7 @@ pre-commit==2.9.2 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.1.0 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==3.1.1 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==3.2 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.1.0 # https://github.com/django-extensions/django-extensions django-coverage-plugin==1.8.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.1.0 # https://github.com/pytest-dev/pytest-django From 3d9b9dc3047a663ceba1eda66bdf1092114b904b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 5 Dec 2020 02:18:58 +0000 Subject: [PATCH 384/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed700575..056feb7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-04] +### Updated +- Update django-debug-toolbar to 3.2 ([#2959](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2959)) + ## [2020-12-02] ### Updated - Update django-model-utils to 4.1.1 ([#2957](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2957)) From a72e597338f601a22b7d11937cca5b2f86040f47 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 7 Dec 2020 17:14:50 -0800 Subject: [PATCH 385/389] Update pre-commit from 2.9.2 to 2.9.3 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 8eea2149..ea8f38c3 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -33,7 +33,7 @@ pylint-django==2.3.0 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.9.2 # https://github.com/pre-commit/pre-commit +pre-commit==2.9.3 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 41d760ddd8a49d31340d3f8af487a3a05d8a7f5a Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 9 Dec 2020 02:23:26 +0000 Subject: [PATCH 386/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 056feb7e..13725c12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-08] +### Updated +- Update pre-commit to 2.9.3 ([#2961](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2961)) + ## [2020-12-04] ### Updated - Update django-debug-toolbar to 3.2 ([#2959](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2959)) From c1b9c2acc5d7f8f94238284df4533c7e304973b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Dec 2020 06:18:22 +0000 Subject: [PATCH 387/389] Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.5.1 to v3.5.2. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.5.1...8c603dbb04b917a9fc2dd991dc54fef54b640b43) Signed-off-by: dependabot[bot] --- .github/workflows/pre-commit-autoupdate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index f471eacf..2b5bb09b 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -26,7 +26,7 @@ jobs: run: pre-commit autoupdate - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.5.1 + uses: peter-evans/create-pull-request@v3.5.2 with: token: ${{ secrets.GITHUB_TOKEN }} branch: update/pre-commit-autoupdate From dde36972acc994dab08162b941a67fe38381fe12 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 10 Dec 2020 02:25:51 +0000 Subject: [PATCH 388/389] Update Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13725c12..68f29a1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## [2020-12-09] +### Changed +- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2964)) + ## [2020-12-08] ### Updated - Update pre-commit to 2.9.3 ([#2961](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2961)) From 633739d19d87a083fe275a482d6fc158edbe6b26 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 10 Dec 2020 05:17:51 -0800 Subject: [PATCH 389/389] Update sentry-sdk from 0.19.4 to 0.19.5 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 38e5ec86..eed4477e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{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.19.4 # https://github.com/getsentry/sentry-python +sentry-sdk==0.19.5 # 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