From dd71966ca1deea600162d5ea19ada94ec559da6e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 9 Oct 2018 13:52:37 -0700 Subject: [PATCH 01/10] Update tox from 3.4.0 to 3.5.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ff5809252..f87427022 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,6 @@ flake8==3.5.0 # Testing # ------------------------------------------------------------------------------ -tox==3.4.0 +tox==3.5.2 pytest==3.8.1 pytest-cookies==0.3.0 From 9c9c831541b6459aed37fc48787d08441348856c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 15 Oct 2018 19:13:36 -0700 Subject: [PATCH 02/10] Update mypy from 0.630 to 0.641 (#1832) --- {{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 c8b8d9be4..d0ebb27ef 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -11,7 +11,7 @@ psycopg2-binary==2.7.5 # https://github.com/psycopg/psycopg2 # Testing # ------------------------------------------------------------------------------ -mypy==0.630 # https://github.com/python/mypy +mypy==0.641 # https://github.com/python/mypy pytest==3.8.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.1 # https://github.com/Frozenball/pytest-sugar From 2ca14c05d0c9ae0dde50d2f65c56f7a96d38fc15 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 17 Oct 2018 07:05:54 -0500 Subject: [PATCH 03/10] Update pytest from 3.8.2 to 3.9.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 379ae48ca..ba3d77d22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,5 @@ flake8==3.5.0 # Testing # ------------------------------------------------------------------------------ tox==3.5.2 -pytest==3.8.2 +pytest==3.9.1 pytest-cookies==0.3.0 From 784f6c9ca7ac9cecbb15cc2bfb51500ddd18bda0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 17 Oct 2018 07:05:55 -0500 Subject: [PATCH 04/10] Update pytest from 3.8.2 to 3.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 d0ebb27ef..fbc29befc 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -12,7 +12,7 @@ psycopg2-binary==2.7.5 # https://github.com/psycopg/psycopg2 # Testing # ------------------------------------------------------------------------------ mypy==0.641 # https://github.com/python/mypy -pytest==3.8.2 # https://github.com/pytest-dev/pytest +pytest==3.9.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.1 # https://github.com/Frozenball/pytest-sugar # Code quality From f5df324920e4d8220e8506517a2f7399a284993f Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 18 Oct 2018 09:46:59 -0500 Subject: [PATCH 05/10] Update djangorestframework from 3.8.2 to 3.9.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 8d0a4144a..7ad31975b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,5 +29,5 @@ django-compressor==2.2 # https://github.com/django-compressor/django-compressor django-redis==4.9.0 # https://github.com/niwinz/django-redis # Django REST Framework -djangorestframework==3.8.2 # https://github.com/encode/django-rest-framework +djangorestframework==3.9.0 # https://github.com/encode/django-rest-framework coreapi==2.3.3 # https://github.com/core-api/python-client From 649ca872d2a7e203650fd2da014800d928647589 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 23 Oct 2018 10:23:23 -0700 Subject: [PATCH 06/10] Update pytest to 3.9.2 (#1837) * Update pytest from 3.9.1 to 3.9.2 * Update pytest from 3.9.1 to 3.9.2 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ba3d77d22..cdb7b49f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,5 @@ flake8==3.5.0 # Testing # ------------------------------------------------------------------------------ tox==3.5.2 -pytest==3.9.1 +pytest==3.9.2 pytest-cookies==0.3.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index fbc29befc..db907531f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -12,7 +12,7 @@ psycopg2-binary==2.7.5 # https://github.com/psycopg/psycopg2 # Testing # ------------------------------------------------------------------------------ mypy==0.641 # https://github.com/python/mypy -pytest==3.9.1 # https://github.com/pytest-dev/pytest +pytest==3.9.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.1 # https://github.com/Frozenball/pytest-sugar # Code quality From 9d4566e52cf36e9f0977706ead35a16523968f99 Mon Sep 17 00:00:00 2001 From: Jerome Leclanche Date: Fri, 19 Oct 2018 10:01:10 +0300 Subject: [PATCH 07/10] Add Postgres 10.5 version support --- CONTRIBUTORS.rst | 4 +++- cookiecutter.json | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index c17c951ef..d66f7fc97 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -106,6 +106,7 @@ Listed in alphabetical order. Irfan Ahmad `@erfaan`_ @erfaan Jan Van Bruggen `@jvanbrug`_ Jens Nilsson `@phiberjenz`_ + Jerome Leclanche `@jleclanche`_ @Adys Jimmy Gitonga `@afrowave`_ @afrowave John Cass `@jcass77`_ @cass_john Julien Almarcha `@sladinji`_ @@ -216,12 +217,13 @@ Listed in alphabetical order. .. _@goldhand: https://github.com/goldhand .. _@hackebrot: https://github.com/hackebrot .. _@hairychris: https://github.com/hairychris -.. _@hendrikschneider https://github.com/hendrikschneider +.. _@hendrikschneider: https://github.com/hendrikschneider .. _@hjwp: https://github.com/hjwp .. _@IanLee1521: https://github.com/IanLee1521 .. _@ikkebr: https://github.com/ikkebr .. _@iynaix: https://github.com/iynaix .. _@jazztpt: https://github.com/jazztpt +.. _@jleclanche: https://github.com/jleclanche .. _@juliocc: https://github.com/juliocc .. _@jvanbrug: https://github.com/jvanbrug .. _@ka7eh: https://github.com/ka7eh diff --git a/cookiecutter.json b/cookiecutter.json index 21a639a3a..9aff23f22 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -18,6 +18,7 @@ "use_pycharm": "n", "use_docker": "n", "postgresql_version": [ + "10.5", "10.4", "10.3", "10.2", From 25477ac33d831781f7da047495ddad6386790ac0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Oct 2018 03:36:29 -0700 Subject: [PATCH 08/10] Update pytz from 2018.5 to 2018.6 (#1840) --- {{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 7ad31975b..33c7ea271 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,4 +1,4 @@ -pytz==2018.5 # https://github.com/stub42/pytz +pytz==2018.6 # https://github.com/stub42/pytz python-slugify==1.2.6 # https://github.com/un33k/python-slugify Pillow==5.3.0 # https://github.com/python-pillow/Pillow {%- if cookiecutter.use_compressor == "y" %} From ef2fc781f82058a1213147fea29b86a1d0a59fbd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 24 Oct 2018 03:36:48 -0700 Subject: [PATCH 09/10] Update flake8 to 3.6.0 (#1839) * Update flake8 from 3.5.0 to 3.6.0 * Update flake8 from 3.5.0 to 3.6.0 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index cdb7b49f5..b89cde996 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -flake8==3.5.0 +flake8==3.6.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index db907531f..120187fec 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -17,7 +17,7 @@ pytest-sugar==0.9.1 # https://github.com/Frozenball/pytest-sugar # Code quality # ------------------------------------------------------------------------------ -flake8==3.5.0 # https://github.com/PyCQA/flake8 +flake8==3.6.0 # https://github.com/PyCQA/flake8 coverage==4.5.1 # https://github.com/nedbat/coveragepy # Django From 6cb59c6ca474926d9e65a0f9a0a37651ede9021d Mon Sep 17 00:00:00 2001 From: Davit Tovmasyan Date: Wed, 24 Oct 2018 14:37:15 +0400 Subject: [PATCH 10/10] Keep ipython history (#1836) --- CONTRIBUTORS.rst | 2 ++ {{cookiecutter.project_slug}}/.envs/.local/.django | 1 + {{cookiecutter.project_slug}}/.gitignore | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index d66f7fc97..509fb83ae 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -85,6 +85,7 @@ Listed in alphabetical order. Daniel Hepper `@dhepper`_ @danielhepper Daniele Tricoli `@eriol`_ David Díaz `@ddiazpinto`_ @DavidDiazPinto + Davit Tovmasyan `@davitovmasyan`_ Davur Clementsen `@dsclementsen`_ @davur Delio Castillo `@jangeador`_ @jangeador Denis Orehovsky `@apirobot`_ @@ -200,6 +201,7 @@ Listed in alphabetical order. .. _@ChrisPappalardo: https://github.com/ChrisPappalardo .. _@chuckus: https://github.com/chuckus .. _@Collederas: https://github.com/Collederas +.. _@davitovmasyan: https://github.com/davitovmasyan .. _@ddiazpinto: https://github.com/ddiazpinto .. _@dezoito: https://github.com/dezoito .. _@dhepper: https://github.com/dhepper diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.django b/{{cookiecutter.project_slug}}/.envs/.local/.django index d94a17e59..2ed5fbf3d 100644 --- a/{{cookiecutter.project_slug}}/.envs/.local/.django +++ b/{{cookiecutter.project_slug}}/.envs/.local/.django @@ -1,6 +1,7 @@ # General # ------------------------------------------------------------------------------ USE_DOCKER=yes +IPYTHONDIR=/app/.ipython # Redis # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index 1eefea0f1..1874e9d92 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -343,3 +343,7 @@ MailHog {{ cookiecutter.project_slug }}/media/ .pytest_cache/ + +{% if cookiecutter.use_docker == 'y' %} +.ipython/ +{%- endif %}