From 26a30c6f0113ca05fbd73c9c924776b768e72138 Mon Sep 17 00:00:00 2001 From: dasDachs Date: Wed, 20 Jun 2018 11:00:11 +0200 Subject: [PATCH 01/30] Added Pipfile and updated {{{cookiecutter.app_name}}/README.rst --- Pipfile | 57 ++++++++++++++++++++++++++++ {{cookiecutter.app_name}}/README.rst | 4 ++ 2 files changed, 61 insertions(+) create mode 100644 Pipfile diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..c195ac3 --- /dev/null +++ b/Pipfile @@ -0,0 +1,57 @@ +[[source]] +url = "https://pypi.python.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +# Flask +Flask = "==1.0.2" +MarkupSafe = "==1.0" +Werkzeug = "==0.14.1" +Jinja2 = "==2.10" +itsdangerous = "==0.24" +click = ">=5.0" + +# Database +Flask-SQLAlchemy = "==2.3.2" +psycopg2 = "==2.7.5" +SQLAlchemy = "==1.2.8" + +# Migrations +Flask-Migrate = "==2.2.0" + +# Forms +Flask-WTF = "==0.14.2" +WTForms = "==2.2.1" + +# Deployment +gunicorn = ">=19.1.1" + +# Webpack +flask-webpack = "==0.1.0" + +# Auth +Flask-Login = "==0.4.1" +Flask-Bcrypt = "==0.7.1" + +# Caching +Flask-Caching = ">=1.0.0" + +# Debug toolbar +Flask-DebugToolbar = "==0.10.1" + +[dev-packages] +# Testing +pytest = "==3.6.1" +WebTest = "==2.0.29" +factory-boy = "==2.11.*" + +# Lint and code style +flake8 = "==3.5.0" +flake8-blind-except = "==0.1.1" +flake8-debugger = "==3.1.0" +flake8-docstrings = "==1.3.0" +flake8-isort = "==2.5" +flake8-quotes = "==1.0.0" +isort = "==4.3.4" +pep8-naming = "==0.7.0" diff --git a/{{cookiecutter.app_name}}/README.rst b/{{cookiecutter.app_name}}/README.rst index 7b4d8d8..a1e4c08 100644 --- a/{{cookiecutter.app_name}}/README.rst +++ b/{{cookiecutter.app_name}}/README.rst @@ -19,7 +19,11 @@ Run the following commands to bootstrap your environment :: git clone https://github.com/{{cookiecutter.github_username}}/{{cookiecutter.app_name}} cd {{cookiecutter.app_name}} + pip install -r requirements/dev.txt + # or use Pipenv + pipenv install --dev + npm install npm start # run the webpack dev server and flask server using concurrently From 577caf7f3fc43fc8a3fa1d52a18c03c747996d6e Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 20 Jun 2018 22:44:33 -0400 Subject: [PATCH 02/30] Update pytest from 3.6.1 to 3.6.2 --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index a57e9c9..0649452 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -2,7 +2,7 @@ -r prod.txt # Testing -pytest==3.6.1 +pytest==3.6.2 WebTest==2.0.29 factory-boy==2.11.1 From 6ecc22bd3d892eff59e892abf76c87eb1c6b3f0d Mon Sep 17 00:00:00 2001 From: dasDachs Date: Thu, 21 Jun 2018 11:47:00 +0200 Subject: [PATCH 03/30] Added post_get hooks to clean up unnecessary package managment files and updated README.rst --- cookiecutter.json | 3 +- hooks/post_gen_project.py | 35 ++++++++++++++++++++ Pipfile => {{cookiecutter.app_name}}/Pipfile | 0 {{cookiecutter.app_name}}/README.rst | 8 ++--- 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 hooks/post_gen_project.py rename Pipfile => {{cookiecutter.app_name}}/Pipfile (100%) diff --git a/cookiecutter.json b/cookiecutter.json index 0ae232c..3f14912 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -4,5 +4,6 @@ "github_username": "sloria", "project_name": "My Flask App", "app_name": "myflaskapp", - "project_short_description": "A flasky app." + "project_short_description": "A flasky app.", + "use_pipenv": ["yes", "no"] } diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py new file mode 100644 index 0000000..339ecfa --- /dev/null +++ b/hooks/post_gen_project.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +"""Post gen hook to ensure that the generated project +hase only one package managment, either pipenv or pip.""" +import os +import shutil +import sys + + +def clean_extra_package_managment_files(): + """Removes either requirements files and folderor the Pipfile.""" + use_pipenv = '{{cookiecutter.use_pipenv}}' + to_delete = [] + + if use_pipenv == 'yes': + to_delete = to_delete + ['requirements.txt', 'requirements'] + else: + to_delete.append('Pipfile') + + try: + for file_or_dir in to_delete: + if os.path.isfile(file_or_dir): + os.remove(file_or_dir) + else: + shutil.rmtree(file_or_dir) + sys.exit(0) + except OSError as e: + sys.stdout.write( + 'While attempting to remove file(s) an error occurred' + ) + sys.stdout.write('Error: {}'.format(e)) + + +if __name__ == '__main__': + clean_extra_package_managment_files() diff --git a/Pipfile b/{{cookiecutter.app_name}}/Pipfile similarity index 100% rename from Pipfile rename to {{cookiecutter.app_name}}/Pipfile diff --git a/{{cookiecutter.app_name}}/README.rst b/{{cookiecutter.app_name}}/README.rst index a1e4c08..c39e426 100644 --- a/{{cookiecutter.app_name}}/README.rst +++ b/{{cookiecutter.app_name}}/README.rst @@ -19,11 +19,11 @@ Run the following commands to bootstrap your environment :: git clone https://github.com/{{cookiecutter.github_username}}/{{cookiecutter.app_name}} cd {{cookiecutter.app_name}} - - pip install -r requirements/dev.txt - # or use Pipenv + {%- if cookiecutter.use_pipenv == "yes" %} pipenv install --dev - + {%- else %} + pip install -r requirements/dev.txt + {%- endif %} npm install npm start # run the webpack dev server and flask server using concurrently From 2c3d429baf098cc4fa8ce211338b1423b7ebd290 Mon Sep 17 00:00:00 2001 From: dasDachs Date: Thu, 21 Jun 2018 11:57:43 +0200 Subject: [PATCH 04/30] Changed the order for pipenv usage in cookiecutter.json to default to no --- cookiecutter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookiecutter.json b/cookiecutter.json index 3f14912..c4a689f 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -5,5 +5,5 @@ "project_name": "My Flask App", "app_name": "myflaskapp", "project_short_description": "A flasky app.", - "use_pipenv": ["yes", "no"] + "use_pipenv": ["no", "yes"] } From d3e4b8d437b67acfc3c9dd8eb22fa3a547096933 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sat, 23 Jun 2018 10:04:40 -0400 Subject: [PATCH 05/30] Update webtest from 2.0.29 to 2.0.30 --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index 0649452..36045ed 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -3,7 +3,7 @@ # Testing pytest==3.6.2 -WebTest==2.0.29 +WebTest==2.0.30 factory-boy==2.11.1 # Lint and code style From f9f51a2261b14e6d9f4f2b75503251af6ad6d8fb Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 29 Jun 2018 16:24:51 -0400 Subject: [PATCH 06/30] Update sqlalchemy from 1.2.8 to 1.2.9 --- {{cookiecutter.app_name}}/requirements/prod.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/prod.txt b/{{cookiecutter.app_name}}/requirements/prod.txt index f051812..e453770 100644 --- a/{{cookiecutter.app_name}}/requirements/prod.txt +++ b/{{cookiecutter.app_name}}/requirements/prod.txt @@ -11,7 +11,7 @@ click>=5.0 # Database Flask-SQLAlchemy==2.3.2 psycopg2==2.7.5 -SQLAlchemy==1.2.8 +SQLAlchemy==1.2.9 # Migrations Flask-Migrate==2.2.0 From 09cf9cd3b170b9800cfed4d0f957965b723237c6 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 5 Jul 2018 09:14:08 -0400 Subject: [PATCH 07/30] Update pytest from 3.6.2 to 3.6.3 --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index 36045ed..3f51635 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -2,7 +2,7 @@ -r prod.txt # Testing -pytest==3.6.2 +pytest==3.6.3 WebTest==2.0.30 factory-boy==2.11.1 From b041e31997fd0f4a2d9bd7d22556faf54ba2ce27 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Fri, 13 Jul 2018 21:40:19 -0400 Subject: [PATCH 08/30] Update sqlalchemy from 1.2.9 to 1.2.10 --- {{cookiecutter.app_name}}/requirements/prod.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/prod.txt b/{{cookiecutter.app_name}}/requirements/prod.txt index e453770..07fe0cf 100644 --- a/{{cookiecutter.app_name}}/requirements/prod.txt +++ b/{{cookiecutter.app_name}}/requirements/prod.txt @@ -11,7 +11,7 @@ click>=5.0 # Database Flask-SQLAlchemy==2.3.2 psycopg2==2.7.5 -SQLAlchemy==1.2.9 +SQLAlchemy==1.2.10 # Migrations Flask-Migrate==2.2.0 From fb2ab6310a6255c89ad2a4d0986fe9198d60fbfc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sun, 29 Jul 2018 23:25:33 +0000 Subject: [PATCH 09/30] Bump pytest from 3.6.3 to 3.6.4 in /{{cookiecutter.app_name}} Bumps [pytest](https://github.com/pytest-dev/pytest) from 3.6.3 to 3.6.4. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/3.6.3...3.6.4) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index 3f51635..cb10171 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -2,7 +2,7 @@ -r prod.txt # Testing -pytest==3.6.3 +pytest==3.6.4 WebTest==2.0.30 factory-boy==2.11.1 From b2e55641c82c1df6a31a3fb1b710e79e84f7aed8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sun, 29 Jul 2018 23:25:36 +0000 Subject: [PATCH 10/30] Bump flask-migrate from 2.2.0 to 2.2.1 in /{{cookiecutter.app_name}} Bumps [flask-migrate](https://github.com/miguelgrinberg/flask-migrate) from 2.2.0 to 2.2.1. - [Release notes](https://github.com/miguelgrinberg/flask-migrate/releases) - [Changelog](https://github.com/miguelgrinberg/Flask-Migrate/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelgrinberg/flask-migrate/compare/v2.2.0...v2.2.1) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/requirements/prod.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/prod.txt b/{{cookiecutter.app_name}}/requirements/prod.txt index 07fe0cf..41a6758 100644 --- a/{{cookiecutter.app_name}}/requirements/prod.txt +++ b/{{cookiecutter.app_name}}/requirements/prod.txt @@ -14,7 +14,7 @@ psycopg2==2.7.5 SQLAlchemy==1.2.10 # Migrations -Flask-Migrate==2.2.0 +Flask-Migrate==2.2.1 # Forms Flask-WTF==0.14.2 From 78b1eecb0739b5dd9be94f4ab58d7db7e184e6fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sun, 29 Jul 2018 23:44:46 +0000 Subject: [PATCH 11/30] Update webpack-dev-server requirement to ^3.1.5 in /{{cookiecutter.app_name}} Updates the requirements on [webpack-dev-server](https://github.com/webpack/webpack-dev-server) to permit the latest version. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Commits](https://github.com/webpack/webpack-dev-server/commits/v3.1.5) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index b1682e8..3093dcf 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -45,6 +45,6 @@ "style-loader": "^0.18.2", "url-loader": "^0.5.9", "webpack": "^2.6.1", - "webpack-dev-server": "^2.4.5" + "webpack-dev-server": "^3.1.5" } } From fc084339f38690e6649122392dae100de0738783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sun, 29 Jul 2018 23:44:48 +0000 Subject: [PATCH 12/30] Update file-loader requirement to ^1.1.11 in /{{cookiecutter.app_name}} Updates the requirements on [file-loader](https://github.com/webpack/file-loader) to permit the latest version. - [Release notes](https://github.com/webpack/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/file-loader/commits/v1.1.11) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index b1682e8..29bff7f 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -36,7 +36,7 @@ "eslint-config-airbnb-base": "^11.2.0", "eslint-plugin-import": "^2.3.0", "extract-text-webpack-plugin": "^2.1.2", - "file-loader": "^0.11.2", + "file-loader": "^1.1.11", "font-awesome-webpack": "0.0.5-beta.2", "less": "^2.7.2", "less-loader": "^4.0.4", From 6cfd02a2163a99a4345da069b1de931f415e71c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sun, 29 Jul 2018 23:44:51 +0000 Subject: [PATCH 13/30] Update babel-eslint requirement to ^8.2.6 in /{{cookiecutter.app_name}} Updates the requirements on [babel-eslint](https://github.com/babel/babel-eslint) to permit the latest version. - [Release notes](https://github.com/babel/babel-eslint/releases) - [Commits](https://github.com/babel/babel-eslint/commits/v8.2.6) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index b1682e8..c762904 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "babel-core": "^6.25.0", - "babel-eslint": "^7.2.3", + "babel-eslint": "^8.2.6", "babel-loader": "^7.0.0", "babel-preset-env": "^1.6.0", "concurrently": "^3.5.0", From e8fbb100a7ff7196eb8254a6e4615ab078d051e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 30 Jul 2018 00:02:10 +0000 Subject: [PATCH 14/30] Update url-loader requirement to ^1.0.1 in /{{cookiecutter.app_name}} Updates the requirements on [url-loader](https://github.com/webpack-contrib/url-loader) to permit the latest version. - [Release notes](https://github.com/webpack-contrib/url-loader/releases) - [Changelog](https://github.com/webpack-contrib/url-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/url-loader/commits/v1.0.1) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 7754ff8..1c7566e 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -43,7 +43,7 @@ "manifest-revision-webpack-plugin": "^0.4.0", "raw-loader": "^0.5.1", "style-loader": "^0.18.2", - "url-loader": "^0.5.9", + "url-loader": "^1.0.1", "webpack": "^2.6.1", "webpack-dev-server": "^3.1.5" } From c9e07d73b4c85e59a2623e8dc755590a02fde912 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 30 Jul 2018 00:03:31 +0000 Subject: [PATCH 15/30] Update less requirement to ^3.8.0 in /{{cookiecutter.app_name}} Updates the requirements on [less](https://github.com/less/less.js) to permit the latest version. - [Release notes](https://github.com/less/less.js/releases) - [Changelog](https://github.com/less/less.js/blob/master/CHANGELOG.md) - [Commits](https://github.com/less/less.js/commits/v3.8.0) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index b166ff5..004c6f2 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -38,7 +38,7 @@ "extract-text-webpack-plugin": "^2.1.2", "file-loader": "^1.1.11", "font-awesome-webpack": "0.0.5-beta.2", - "less": "^2.7.2", + "less": "^3.8.0", "less-loader": "^4.0.4", "manifest-revision-webpack-plugin": "^0.4.0", "raw-loader": "^0.5.1", From 445f23d16be37774247c98948cd686ed1cb390b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 30 Jul 2018 12:12:12 +0000 Subject: [PATCH 16/30] Update css-loader requirement to ^1.0.0 in /{{cookiecutter.app_name}} Updates the requirements on [css-loader](https://github.com/webpack-contrib/css-loader) to permit the latest version. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/commits/v1.0.0) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 3d9de65..95a05b9 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -31,7 +31,7 @@ "babel-loader": "^7.0.0", "babel-preset-env": "^1.6.0", "concurrently": "^3.5.0", - "css-loader": "^0.28.4", + "css-loader": "^1.0.0", "eslint": "^3.19.0", "eslint-config-airbnb-base": "^11.2.0", "eslint-plugin-import": "^2.3.0", From b65d18b7120c77acf258af8cbedf3eb15871db31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 31 Jul 2018 12:12:23 +0000 Subject: [PATCH 17/30] Bump pytest from 3.6.4 to 3.7.0 in /{{cookiecutter.app_name}} Bumps [pytest](https://github.com/pytest-dev/pytest) from 3.6.4 to 3.7.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/3.6.4...3.7.0) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index cb10171..e825cf0 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -2,7 +2,7 @@ -r prod.txt # Testing -pytest==3.6.4 +pytest==3.7.0 WebTest==2.0.30 factory-boy==2.11.1 From f971c04a982c44f3cd1a056699cbb2a22b82a30f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 3 Aug 2018 12:12:41 +0000 Subject: [PATCH 18/30] Bump pytest from 3.7.0 to 3.7.1 in /{{cookiecutter.app_name}} Bumps [pytest](https://github.com/pytest-dev/pytest) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/3.7.0...3.7.1) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index e825cf0..fba3bc2 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -2,7 +2,7 @@ -r prod.txt # Testing -pytest==3.7.0 +pytest==3.7.1 WebTest==2.0.30 factory-boy==2.11.1 From 17b3c1ac28a0402d3ad9b8a4e9dc52c0ebaa20e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 6 Aug 2018 12:12:46 +0000 Subject: [PATCH 19/30] Update eslint requirement from ^3.19.0 to ^5.3.0 in /{{cookiecutter.app_name}} Updates the requirements on [eslint](https://github.com/eslint/eslint) to permit the latest version. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/commits/v5.3.0) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 95a05b9..01059e0 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -32,7 +32,7 @@ "babel-preset-env": "^1.6.0", "concurrently": "^3.5.0", "css-loader": "^1.0.0", - "eslint": "^3.19.0", + "eslint": "^5.3.0", "eslint-config-airbnb-base": "^11.2.0", "eslint-plugin-import": "^2.3.0", "extract-text-webpack-plugin": "^2.1.2", From 973bcd96cb2d7e62ee790ecd3d45d3e0421822de Mon Sep 17 00:00:00 2001 From: Steven Loria Date: Mon, 6 Aug 2018 21:07:32 -0400 Subject: [PATCH 20/30] Use environment variables for configuration As per https://12factor.net/ Use environs/python-dotenv for reading/parsing variables --- README.rst | 1 + tasks.py | 10 +-- {{cookiecutter.app_name}}/.env.example | 5 ++ {{cookiecutter.app_name}}/.gitignore | 6 ++ {{cookiecutter.app_name}}/Pipfile | 3 + {{cookiecutter.app_name}}/README.rst | 18 ++--- {{cookiecutter.app_name}}/autoapp.py | 7 +- {{cookiecutter.app_name}}/package.json | 2 +- .../requirements/prod.txt | 3 + {{cookiecutter.app_name}}/tests/conftest.py | 3 +- {{cookiecutter.app_name}}/tests/settings.py | 11 +++ .../tests/test_config.py | 19 ----- .../{{cookiecutter.app_name}}/app.py | 3 +- .../{{cookiecutter.app_name}}/settings.py | 70 ++++++------------- 14 files changed, 65 insertions(+), 96 deletions(-) create mode 100644 {{cookiecutter.app_name}}/.env.example create mode 100644 {{cookiecutter.app_name}}/tests/settings.py delete mode 100644 {{cookiecutter.app_name}}/tests/test_config.py diff --git a/README.rst b/README.rst index 06a22b0..5998d13 100644 --- a/README.rst +++ b/README.rst @@ -25,6 +25,7 @@ Features - Bootstrap 3 and Font Awesome 4 with starter templates - Flask-SQLAlchemy with basic User model - Easy database migrations with Flask-Migrate +- Configuration in environment variables, as per `The Twelve-Factor App `_ - Flask-WTForms with login and registration forms - Flask-Login for authentication - Flask-Bcrypt for password hashing diff --git a/tasks.py b/tasks.py index 7e412ce..9d8d5df 100644 --- a/tasks.py +++ b/tasks.py @@ -13,7 +13,6 @@ with open(os.path.join(HERE, 'cookiecutter.json'), 'r') as fp: COOKIECUTTER_SETTINGS = json.load(fp) # Match default value of app_name from cookiecutter.json COOKIE = os.path.join(HERE, COOKIECUTTER_SETTINGS['app_name']) -AUTOAPP = os.path.join(COOKIE, 'autoapp.py') REQUIREMENTS = os.path.join(COOKIE, 'requirements', 'dev.txt') @@ -42,7 +41,8 @@ def clean(ctx): def _run_flask_command(ctx, command): - ctx.run('FLASK_APP={0} flask {1}'.format(AUTOAPP, command), echo=True) + os.chdir(COOKIE) + ctx.run('flask {0}'.format(command), echo=True) @task(pre=[clean, build]) @@ -52,12 +52,14 @@ def test(ctx): echo=True) _run_npm_command(ctx, 'run lint') os.chdir(COOKIE) + shutil.copyfile(os.path.join(COOKIE, '.env.example'), + os.path.join(COOKIE, '.env')) _run_flask_command(ctx, 'lint') _run_flask_command(ctx, 'test') + @task def readme(ctx, browse=False): - ctx.run("rst2html.py README.rst > README.html") + ctx.run('rst2html.py README.rst > README.html') if browse: webbrowser.open_new_tab('README.html') - diff --git a/{{cookiecutter.app_name}}/.env.example b/{{cookiecutter.app_name}}/.env.example new file mode 100644 index 0000000..7236746 --- /dev/null +++ b/{{cookiecutter.app_name}}/.env.example @@ -0,0 +1,5 @@ +# Environment variable overrides for local development +FLASK_APP=autoapp.py +FLASK_ENV=development +DATABASE_URL="sqlite:////tmp/dev.db" +SECRET_KEY="not-so-secret" diff --git a/{{cookiecutter.app_name}}/.gitignore b/{{cookiecutter.app_name}}/.gitignore index be87252..24d2ea2 100644 --- a/{{cookiecutter.app_name}}/.gitignore +++ b/{{cookiecutter.app_name}}/.gitignore @@ -51,3 +51,9 @@ env/ # webpack-built files /{{cookiecutter.app_name}}/static/build/ /{{cookiecutter.app_name}}/webpack/manifest.json + +# Configuration +.env + +# Development database +*.db diff --git a/{{cookiecutter.app_name}}/Pipfile b/{{cookiecutter.app_name}}/Pipfile index c195ac3..d9b88d9 100644 --- a/{{cookiecutter.app_name}}/Pipfile +++ b/{{cookiecutter.app_name}}/Pipfile @@ -40,6 +40,9 @@ Flask-Caching = ">=1.0.0" # Debug toolbar Flask-DebugToolbar = "==0.10.1" +# Environment variable parsing +environs = "==4.0.0" + [dev-packages] # Testing pytest = "==3.6.1" diff --git a/{{cookiecutter.app_name}}/README.rst b/{{cookiecutter.app_name}}/README.rst index c39e426..0a89530 100644 --- a/{{cookiecutter.app_name}}/README.rst +++ b/{{cookiecutter.app_name}}/README.rst @@ -8,13 +8,6 @@ Quickstart ---------- -First, set your app's secret key as an environment variable. For example, -add the following to ``.bashrc`` or ``.bash_profile``. - -.. code-block:: bash - - export {{cookiecutter.app_name | upper}}_SECRET='something-really-secret' - Run the following commands to bootstrap your environment :: git clone https://github.com/{{cookiecutter.github_username}}/{{cookiecutter.app_name}} @@ -24,17 +17,12 @@ Run the following commands to bootstrap your environment :: {%- else %} pip install -r requirements/dev.txt {%- endif %} + cp .env.example .env npm install npm start # run the webpack dev server and flask server using concurrently You will see a pretty welcome screen. -In general, before running shell commands, set the ``FLASK_APP`` and -``FLASK_DEBUG`` environment variables :: - - export FLASK_APP=autoapp.py - export FLASK_DEBUG=1 - Once you have installed your DBMS, run the following to create your app's database tables and perform the initial migration :: @@ -49,12 +37,14 @@ Deployment To deploy:: + export FLASK_ENV=production export FLASK_DEBUG=0 + export DATABASE_URL="" npm run build # build assets with webpack flask run # start the flask server In your production environment, make sure the ``FLASK_DEBUG`` environment -variable is unset or is set to ``0``, so that ``ProdConfig`` is used. +variable is unset or is set to ``0``. Shell diff --git a/{{cookiecutter.app_name}}/autoapp.py b/{{cookiecutter.app_name}}/autoapp.py index f7ab4d6..8bcd8c8 100755 --- a/{{cookiecutter.app_name}}/autoapp.py +++ b/{{cookiecutter.app_name}}/autoapp.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- """Create an application instance.""" -from flask.helpers import get_debug_flag - from {{cookiecutter.app_name}}.app import create_app -from {{cookiecutter.app_name}}.settings import DevConfig, ProdConfig - -CONFIG = DevConfig if get_debug_flag() else ProdConfig -app = create_app(CONFIG) +app = create_app() diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 95a05b9..2e1b2e3 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -6,7 +6,7 @@ "build": "NODE_ENV=production webpack --progress --colors -p", "start": "concurrently -n \"WEBPACK,FLASK\" -c \"bgBlue.bold,bgMagenta.bold\" \"npm run webpack-dev-server\" \"npm run flask-server\"", "webpack-dev-server": "NODE_ENV=debug webpack-dev-server --port 2992 --hot --inline", - "flask-server": "FLASK_APP=$PWD/autoapp.py FLASK_DEBUG=1 flask run", + "flask-server": "flask run", "lint": "eslint \"assets/js/*.js\"" }, "repository": { diff --git a/{{cookiecutter.app_name}}/requirements/prod.txt b/{{cookiecutter.app_name}}/requirements/prod.txt index 41a6758..bf4b3d7 100644 --- a/{{cookiecutter.app_name}}/requirements/prod.txt +++ b/{{cookiecutter.app_name}}/requirements/prod.txt @@ -35,3 +35,6 @@ Flask-Caching>=1.0.0 # Debug toolbar Flask-DebugToolbar==0.10.1 + +# Environment variable parsing +environs==4.0.0 diff --git a/{{cookiecutter.app_name}}/tests/conftest.py b/{{cookiecutter.app_name}}/tests/conftest.py index ab709ff..5bb60c0 100644 --- a/{{cookiecutter.app_name}}/tests/conftest.py +++ b/{{cookiecutter.app_name}}/tests/conftest.py @@ -6,7 +6,6 @@ from webtest import TestApp from {{cookiecutter.app_name}}.app import create_app from {{cookiecutter.app_name}}.database import db as _db -from {{cookiecutter.app_name}}.settings import TestConfig from .factories import UserFactory @@ -14,7 +13,7 @@ from .factories import UserFactory @pytest.fixture def app(): """An application for the tests.""" - _app = create_app(TestConfig) + _app = create_app('tests.settings') ctx = _app.test_request_context() ctx.push() diff --git a/{{cookiecutter.app_name}}/tests/settings.py b/{{cookiecutter.app_name}}/tests/settings.py new file mode 100644 index 0000000..a13e159 --- /dev/null +++ b/{{cookiecutter.app_name}}/tests/settings.py @@ -0,0 +1,11 @@ +"""Settings module for test app.""" +ENV = 'development' +TESTING = True +SQLALCHEMY_DATABASE_URI = 'sqlite://' +SECRET_KEY = 'not-so-secret-in-tests' +BCRYPT_LOG_ROUNDS = 4 # For faster tests; needs at least 4 to avoid "ValueError: Invalid rounds" +DEBUG_TB_ENABLED = False +CACHE_TYPE = 'simple' # Can be "memcached", "redis", etc. +SQLALCHEMY_TRACK_MODIFICATIONS = False +WEBPACK_MANIFEST_PATH = 'webpack/manifest.json' +WTF_CSRF_ENABLED = False # Allows form testing diff --git a/{{cookiecutter.app_name}}/tests/test_config.py b/{{cookiecutter.app_name}}/tests/test_config.py deleted file mode 100644 index 755bed7..0000000 --- a/{{cookiecutter.app_name}}/tests/test_config.py +++ /dev/null @@ -1,19 +0,0 @@ -# -*- coding: utf-8 -*- -"""Test configs.""" -from {{cookiecutter.app_name}}.app import create_app -from {{cookiecutter.app_name}}.settings import DevConfig, ProdConfig - - -def test_production_config(): - """Production config.""" - app = create_app(ProdConfig) - assert app.config['ENV'] == 'prod' - assert app.config['DEBUG'] is False - assert app.config['DEBUG_TB_ENABLED'] is False - - -def test_dev_config(): - """Development config.""" - app = create_app(DevConfig) - assert app.config['ENV'] == 'dev' - assert app.config['DEBUG'] is True diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py index 4740288..0879645 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/app.py @@ -4,10 +4,9 @@ from flask import Flask, render_template from {{cookiecutter.app_name}} import commands, public, user from {{cookiecutter.app_name}}.extensions import bcrypt, cache, csrf_protect, db, debug_toolbar, login_manager, migrate, webpack -from {{cookiecutter.app_name}}.settings import ProdConfig -def create_app(config_object=ProdConfig): +def create_app(config_object='{{cookiecutter.app_name}}.settings'): """An application factory, as explained here: http://flask.pocoo.org/docs/patterns/appfactories/. :param config_object: The configuration object to use. diff --git a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py index 2bf866e..4c920b0 100644 --- a/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py +++ b/{{cookiecutter.app_name}}/{{cookiecutter.app_name}}/settings.py @@ -1,49 +1,23 @@ # -*- coding: utf-8 -*- -"""Application configuration.""" -import os - - -class Config(object): - """Base configuration.""" - - SECRET_KEY = os.environ.get('{{cookiecutter.app_name | upper}}_SECRET', 'secret-key') # TODO: Change me - APP_DIR = os.path.abspath(os.path.dirname(__file__)) # This directory - PROJECT_ROOT = os.path.abspath(os.path.join(APP_DIR, os.pardir)) - BCRYPT_LOG_ROUNDS = 13 - DEBUG_TB_ENABLED = False # Disable Debug toolbar - DEBUG_TB_INTERCEPT_REDIRECTS = False - CACHE_TYPE = 'simple' # Can be "memcached", "redis", etc. - SQLALCHEMY_TRACK_MODIFICATIONS = False - WEBPACK_MANIFEST_PATH = 'webpack/manifest.json' - - -class ProdConfig(Config): - """Production configuration.""" - - ENV = 'prod' - DEBUG = False - SQLALCHEMY_DATABASE_URI = 'postgresql://localhost/example' # TODO: Change me - DEBUG_TB_ENABLED = False # Disable Debug toolbar - - -class DevConfig(Config): - """Development configuration.""" - - ENV = 'dev' - DEBUG = True - DB_NAME = 'dev.db' - # Put the db file in project root - DB_PATH = os.path.join(Config.PROJECT_ROOT, DB_NAME) - SQLALCHEMY_DATABASE_URI = 'sqlite:///{0}'.format(DB_PATH) - DEBUG_TB_ENABLED = True - CACHE_TYPE = 'simple' # Can be "memcached", "redis", etc. - - -class TestConfig(Config): - """Test configuration.""" - - TESTING = True - DEBUG = True - SQLALCHEMY_DATABASE_URI = 'sqlite://' - BCRYPT_LOG_ROUNDS = 4 # For faster tests; needs at least 4 to avoid "ValueError: Invalid rounds" - WTF_CSRF_ENABLED = False # Allows form testing +"""Application configuration. + +Most configuration is set via environment variables. + +For local development, use a .env file to set +environment variables. +""" +from environs import Env + +env = Env() +env.read_env() + +ENV = env.str('FLASK_ENV', default='production') +DEBUG = ENV == 'development' +SQLALCHEMY_DATABASE_URI = env.str('DATABASE_URL') +SECRET_KEY = env.str('SECRET_KEY') +BCRYPT_LOG_ROUNDS = env.int('BCRYPT_LOG_ROUNDS', default=13) +DEBUG_TB_ENABLED = DEBUG +DEBUG_TB_INTERCEPT_REDIRECTS = False +CACHE_TYPE = 'simple' # Can be "memcached", "redis", etc. +SQLALCHEMY_TRACK_MODIFICATIONS = False +WEBPACK_MANIFEST_PATH = 'webpack/manifest.json' From 9d33a184fe6a45c3f7394a14397e929b36978899 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 20 Aug 2018 12:13:08 +0000 Subject: [PATCH 21/30] Bump pytest from 3.7.1 to 3.7.2 in /{{cookiecutter.app_name}} Bumps [pytest](https://github.com/pytest-dev/pytest) from 3.7.1 to 3.7.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/3.7.1...3.7.2) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index fba3bc2..d42bfc2 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -2,7 +2,7 @@ -r prod.txt # Testing -pytest==3.7.1 +pytest==3.7.2 WebTest==2.0.30 factory-boy==2.11.1 From 585f0d0828f17a33969a5317ac159706b3b07ebd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 21 Aug 2018 12:12:20 +0000 Subject: [PATCH 22/30] Bump sqlalchemy from 1.2.10 to 1.2.11 in /{{cookiecutter.app_name}} Bumps [sqlalchemy](https://bitbucket.org/zzzeek/sqlalchemy) from 1.2.10 to 1.2.11. - [Changelog](https://bitbucket.org/zzzeek/sqlalchemy/src/master/CHANGES) - [Commits](https://bitbucket.org/zzzeek/sqlalchemy/commits) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/requirements/prod.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/prod.txt b/{{cookiecutter.app_name}}/requirements/prod.txt index bf4b3d7..65c2b90 100644 --- a/{{cookiecutter.app_name}}/requirements/prod.txt +++ b/{{cookiecutter.app_name}}/requirements/prod.txt @@ -11,7 +11,7 @@ click>=5.0 # Database Flask-SQLAlchemy==2.3.2 psycopg2==2.7.5 -SQLAlchemy==1.2.10 +SQLAlchemy==1.2.11 # Migrations Flask-Migrate==2.2.1 From de96c5d3dbc6e3b122b66f0064ec9a0d60319bcb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 27 Aug 2018 12:13:33 +0000 Subject: [PATCH 23/30] Bump pytest from 3.7.2 to 3.7.3 in /{{cookiecutter.app_name}} Bumps [pytest](https://github.com/pytest-dev/pytest) from 3.7.2 to 3.7.3. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/3.7.2...3.7.3) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index d42bfc2..9312663 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -2,7 +2,7 @@ -r prod.txt # Testing -pytest==3.7.2 +pytest==3.7.3 WebTest==2.0.30 factory-boy==2.11.1 From 2403331e03ecfda3b7344de380e20ef44a04949a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 30 Aug 2018 12:12:53 +0000 Subject: [PATCH 24/30] Bump pytest from 3.7.3 to 3.7.4 in /{{cookiecutter.app_name}} Bumps [pytest](https://github.com/pytest-dev/pytest) from 3.7.3 to 3.7.4. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/3.7.3...3.7.4) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/requirements/dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/requirements/dev.txt b/{{cookiecutter.app_name}}/requirements/dev.txt index 9312663..8c26898 100644 --- a/{{cookiecutter.app_name}}/requirements/dev.txt +++ b/{{cookiecutter.app_name}}/requirements/dev.txt @@ -2,7 +2,7 @@ -r prod.txt # Testing -pytest==3.7.3 +pytest==3.7.4 WebTest==2.0.30 factory-boy==2.11.1 From 8aac6d10c65a08497547b6dca87615ac7b1c6b49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 3 Sep 2018 12:16:18 +0000 Subject: [PATCH 25/30] Bump webtest from 2.0.29 to 2.0.30 in /{{cookiecutter.app_name}} Bumps [webtest](https://github.com/Pylons/webtest) from 2.0.29 to 2.0.30. - [Release notes](https://github.com/Pylons/webtest/releases) - [Commits](https://github.com/Pylons/webtest/compare/2.0.29...2.0.30) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/Pipfile b/{{cookiecutter.app_name}}/Pipfile index d9b88d9..117ba62 100644 --- a/{{cookiecutter.app_name}}/Pipfile +++ b/{{cookiecutter.app_name}}/Pipfile @@ -46,7 +46,7 @@ environs = "==4.0.0" [dev-packages] # Testing pytest = "==3.6.1" -WebTest = "==2.0.29" +WebTest = "==2.0.30" factory-boy = "==2.11.*" # Lint and code style From 9155fb52a3313c089c2ae18115f7794285911667 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 28 Aug 2018 12:13:27 +0000 Subject: [PATCH 26/30] Update babel-eslint requirement from ^8.2.6 to ^9.0.0 in /{{cookiecutter.app_name}} Updates the requirements on [babel-eslint](https://github.com/babel/babel-eslint) to permit the latest version. - [Release notes](https://github.com/babel/babel-eslint/releases) - [Commits](https://github.com/babel/babel-eslint/commits/v9.0.0) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 376f1ea..551b735 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "babel-core": "^6.25.0", - "babel-eslint": "^8.2.6", + "babel-eslint": "^9.0.0", "babel-loader": "^7.0.0", "babel-preset-env": "^1.6.0", "concurrently": "^3.5.0", From bc4e3ad40018178e3fdc7a8fb5156fd2bfd9b572 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 28 Aug 2018 12:13:26 +0000 Subject: [PATCH 27/30] Update style-loader requirement from ^0.18.2 to ^0.23.0 in /{{cookiecutter.app_name}} Updates the requirements on [style-loader](https://github.com/webpack-contrib/style-loader) to permit the latest version. - [Release notes](https://github.com/webpack-contrib/style-loader/releases) - [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/style-loader/commits/v0.23.0) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 551b735..a9352d4 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -42,7 +42,7 @@ "less-loader": "^4.0.4", "manifest-revision-webpack-plugin": "^0.4.0", "raw-loader": "^0.5.1", - "style-loader": "^0.18.2", + "style-loader": "^0.23.0", "url-loader": "^1.0.1", "webpack": "^2.6.1", "webpack-dev-server": "^3.1.5" From 9930e019e4df655c764fe8689f42243877c48712 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 27 Aug 2018 12:12:33 +0000 Subject: [PATCH 28/30] Update concurrently requirement from ^3.5.0 to ^4.0.1 in /{{cookiecutter.app_name}} Updates the requirements on [concurrently](https://github.com/kimmobrunfeldt/concurrently) to permit the latest version. - [Release notes](https://github.com/kimmobrunfeldt/concurrently/releases) - [Commits](https://github.com/kimmobrunfeldt/concurrently/commits/v4.0.1) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index a9352d4..81acb86 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -30,7 +30,7 @@ "babel-eslint": "^9.0.0", "babel-loader": "^7.0.0", "babel-preset-env": "^1.6.0", - "concurrently": "^3.5.0", + "concurrently": "^4.0.1", "css-loader": "^1.0.0", "eslint": "^5.3.0", "eslint-config-airbnb-base": "^11.2.0", From 8e2240991c5bf3ce30c1de922e007fd79c710a54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 22 Aug 2018 12:13:10 +0000 Subject: [PATCH 29/30] Update file-loader requirement from ^1.1.11 to ^2.0.0 in /{{cookiecutter.app_name}} Updates the requirements on [file-loader](https://github.com/webpack-contrib/file-loader) to permit the latest version. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/file-loader/commits/v2.0.0) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 81acb86..75433bf 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -36,7 +36,7 @@ "eslint-config-airbnb-base": "^11.2.0", "eslint-plugin-import": "^2.3.0", "extract-text-webpack-plugin": "^2.1.2", - "file-loader": "^1.1.11", + "file-loader": "^2.0.0", "font-awesome-webpack": "0.0.5-beta.2", "less": "^3.8.0", "less-loader": "^4.0.4", From 685067e13b6e1384e4b13b73720d0efba059ce64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 13 Aug 2018 12:14:46 +0000 Subject: [PATCH 30/30] Update eslint-config-airbnb-base requirement from ^11.2.0 to ^13.1.0 in /{{cookiecutter.app_name}} Updates the requirements on [eslint-config-airbnb-base](https://github.com/airbnb/javascript) to permit the latest version. - [Release notes](https://github.com/airbnb/javascript/releases) - [Commits](https://github.com/airbnb/javascript/commits/eslint-config-airbnb-base-v13.1.0) Signed-off-by: dependabot[bot] --- {{cookiecutter.app_name}}/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.app_name}}/package.json b/{{cookiecutter.app_name}}/package.json index 75433bf..da1d4d0 100644 --- a/{{cookiecutter.app_name}}/package.json +++ b/{{cookiecutter.app_name}}/package.json @@ -33,7 +33,7 @@ "concurrently": "^4.0.1", "css-loader": "^1.0.0", "eslint": "^5.3.0", - "eslint-config-airbnb-base": "^11.2.0", + "eslint-config-airbnb-base": "^13.1.0", "eslint-plugin-import": "^2.3.0", "extract-text-webpack-plugin": "^2.1.2", "file-loader": "^2.0.0",