From 7d25d82b813aff67ca98729783d8d1956f3338c7 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 7 Apr 2017 07:32:28 +0200 Subject: Python >= 3.5 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index a345320b..5db05f6e 100644 --- a/README.rst +++ b/README.rst @@ -25,7 +25,7 @@ The core technologies are `Flask `_, `SQLAlchemy `_ and `React `_. -Python 3.5 is required. +Python >= 3.5 is required. Documentation ------------- -- cgit From 2b3e45f9fae1b642bcc19505e3b899227de2adf0 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 7 Apr 2017 08:57:49 +0200 Subject: fix the link where bootstrao should be cloned --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index e8bb2585..4c4564be 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ "repository": "https://github.com/newspipe/newspipe", "logo": "https://raw.githubusercontent.com/newspipe/newspipe/master/src/web/static/img/newspipe.png", "scripts": { - "postdeploy": "python src/manager.py db_create; cd submodules/bootstrap/; git clone https://github.com/twbs/bootstrap.git" + "postdeploy": "python src/manager.py db_create; cd submodules/bootstrap/; git clone https://github.com/twbs/bootstrap.git ." }, "env": { "PLATFORM_URL": { -- cgit From 1e7789fc0876112ccb676b89adc9342a7b14082e Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 7 Apr 2017 10:49:51 +0200 Subject: Set all the buildpacks. --- app.json | 139 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 75 insertions(+), 64 deletions(-) diff --git a/app.json b/app.json index 4c4564be..79c95099 100644 --- a/app.json +++ b/app.json @@ -1,68 +1,79 @@ { - "name": "Newspipe", - "description": "A news aggregator that can be deployed on Heroku.", - "keywords": [ - "aggregator", - "news", - "RSS" - ], - "website": "https://github.com/newspipe/", - "repository": "https://github.com/newspipe/newspipe", - "logo": "https://raw.githubusercontent.com/newspipe/newspipe/master/src/web/static/img/newspipe.png", - "scripts": { - "postdeploy": "python src/manager.py db_create; cd submodules/bootstrap/; git clone https://github.com/twbs/bootstrap.git ." - }, - "env": { - "PLATFORM_URL": { - "description": "Address of your instance (for example: https://YOUR-APPLICATION-NAME.herokuapp.com/)", - "required": true, - "value": "" + "name": "Newspipe", + "description": "A news aggregator that can be deployed on Heroku.", + "keywords": [ + "aggregator", + "news", + "RSS" + ], + "website": "https://github.com/newspipe/", + "repository": "https://github.com/newspipe/newspipe", + "logo": "https://raw.githubusercontent.com/newspipe/newspipe/master/src/web/static/img/newspipe.png", + "scripts": { + "postdeploy": "python src/manager.py db_create; cd submodules/bootstrap/; git clone https://github.com/twbs/bootstrap.git ." }, - "ADMIN_EMAIL": { - "description": "Your email address for the authentication to the platform.", - "required": true, - "value": "" - }, - "ADMIN_PASSWORD": { - "description": "Your password.", - "required": true, - "value": "" - }, - "SECRET_KEY": { - "description": "A secret token only you know in order to use sessions.", - "required": true, - "value": "iYtWRvAl!S7+Gz8kabK3@CBvr" - }, - "SELF_REGISTRATION": { - "description": "Users are able to create new account.", - "required": true, - "value": "false" - }, - "SECURITY_PASSWORD_SALT": { - "description": "A secret to confirm user account with a link in an email.", - "required": true, - "value": "^HEpK@L&cP5dMR^kiz8IIZj8q" - }, - "TOKEN_VALIDITY_PERIOD": { - "description": "Validity period (in seconds) of the account confirmation link sent by email.", - "required": true, - "value": "3600" - }, - "HEROKU": "1", - "CDN_ADDRESS": "https://cdn.cedricbonhomme.org/", - "NOTIFICATION_EMAIL": "newspipe@no-reply.com", - "POSTMARK_API_KEY": "REDACTED", - "CRAWLER_RESOLV": { - "description": "Specify if the crawler should try to resolve link of articles behind proxies.", - "value": "false" - }, - "FEED_REFRESH_INTERVAL": { - "description": "Feeds refresh interval (in minutes) for the crawler.", - "value": "120" + "addons": [ + "heroku-postgresql:hobby-dev", + "scheduler:standard" + ], + "buildpacks": [ + { + "url": "https://github.com/ejholmes/heroku-buildpack-bower" + }, + { + "url": "https://github.com/heroku/heroku-buildpack-nodejs" + }, + { + "url": "heroku/python" + } + ], + "env": { + "PLATFORM_URL": { + "description": "Address of your instance (for example: https://YOUR-APPLICATION-NAME.herokuapp.com/)", + "required": true, + "value": "" + }, + "ADMIN_EMAIL": { + "description": "Your email address for the authentication to the platform.", + "required": true, + "value": "" + }, + "ADMIN_PASSWORD": { + "description": "Your password.", + "required": true, + "value": "" + }, + "SECRET_KEY": { + "description": "A secret token only you know in order to use sessions.", + "required": true, + "value": "iYtWRvAl!S7+Gz8kabK3@CBvr" + }, + "SELF_REGISTRATION": { + "description": "Users are able to create new account.", + "required": true, + "value": "false" + }, + "SECURITY_PASSWORD_SALT": { + "description": "A secret to confirm user account with a link in an email.", + "required": true, + "value": "^HEpK@L&cP5dMR^kiz8IIZj8q" + }, + "TOKEN_VALIDITY_PERIOD": { + "description": "Validity period (in seconds) of the account confirmation link sent by email.", + "required": true, + "value": "3600" + }, + "HEROKU": "1", + "CDN_ADDRESS": "https://cdn.cedricbonhomme.org/", + "NOTIFICATION_EMAIL": "newspipe@no-reply.com", + "POSTMARK_API_KEY": "REDACTED", + "CRAWLER_RESOLV": { + "description": "Specify if the crawler should try to resolve link of articles behind proxies.", + "value": "false" + }, + "FEED_REFRESH_INTERVAL": { + "description": "Feeds refresh interval (in minutes) for the crawler.", + "value": "120" + } } - }, - "addons": [ - "heroku-postgresql:hobby-dev", - "scheduler:standard" - ] } -- cgit From c7117a49100775795357e538740b16fa770b3678 Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 7 Apr 2017 10:52:30 +0200 Subject: change order of buildpacks --- app.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.json b/app.json index 79c95099..e8a96efb 100644 --- a/app.json +++ b/app.json @@ -18,10 +18,10 @@ ], "buildpacks": [ { - "url": "https://github.com/ejholmes/heroku-buildpack-bower" + "url": "https://github.com/heroku/heroku-buildpack-nodejs" }, { - "url": "https://github.com/heroku/heroku-buildpack-nodejs" + "url": "https://github.com/ejholmes/heroku-buildpack-bower" }, { "url": "heroku/python" -- cgit From 8950edb0dd98f17a15f0b8c74c390da86924659b Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 7 Apr 2017 11:15:42 +0200 Subject: Heroku Button will not work with repos that have Git submodules. Heroku Button relies on the Build API and uses tarballs fetched from GitHub... --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index e8a96efb..89d39bb5 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ "repository": "https://github.com/newspipe/newspipe", "logo": "https://raw.githubusercontent.com/newspipe/newspipe/master/src/web/static/img/newspipe.png", "scripts": { - "postdeploy": "python src/manager.py db_create; cd submodules/bootstrap/; git clone https://github.com/twbs/bootstrap.git ." + "postdeploy": "python src/manager.py db_create" }, "addons": [ "heroku-postgresql:hobby-dev", -- cgit From ad952a580874f47b4261cedb33c8ccdec8197ece Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Fri, 7 Apr 2017 11:38:39 +0200 Subject: bootstrap is no longer deployed as a submodule --- .gitmodules | 3 --- bower.json | 3 ++- src/web/static/css/bootstrap-theme.min.css | 2 +- src/web/static/css/bootstrap-theme.min.css.map | 2 +- src/web/static/css/bootstrap.min.css | 2 +- src/web/static/css/bootstrap.min.css.map | 2 +- src/web/static/fonts | 2 +- submodules/bootstrap | 1 - 8 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 .gitmodules delete mode 160000 submodules/bootstrap diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 91931bb4..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "submodules/bootstrap"] - path = submodules/bootstrap - url = https://github.com/twbs/bootstrap.git diff --git a/bower.json b/bower.json index cf816f65..56d4ff1d 100644 --- a/bower.json +++ b/bower.json @@ -12,6 +12,7 @@ "dependencies": { "datatables.net": "^1.10.12", "datatables.net-dt": "^1.10.12", - "datatables.net-bs": "^1.10.12" + "datatables.net-bs": "^1.10.12", + "bootstrap": "^3.3.7" } } diff --git a/src/web/static/css/bootstrap-theme.min.css b/src/web/static/css/bootstrap-theme.min.css index 27d5b351..06469c8d 120000 --- a/src/web/static/css/bootstrap-theme.min.css +++ b/src/web/static/css/bootstrap-theme.min.css @@ -1 +1 @@ -../../../../submodules/bootstrap/dist/css/bootstrap-theme.min.css \ No newline at end of file +../bower_components/bootstrap/dist/css/bootstrap-theme.min.css \ No newline at end of file diff --git a/src/web/static/css/bootstrap-theme.min.css.map b/src/web/static/css/bootstrap-theme.min.css.map index 8172f381..0448a4a0 120000 --- a/src/web/static/css/bootstrap-theme.min.css.map +++ b/src/web/static/css/bootstrap-theme.min.css.map @@ -1 +1 @@ -../../../../submodules/bootstrap/dist/css/bootstrap-theme.min.css.map \ No newline at end of file +../bower_components/bootstrap/dist/css/bootstrap-theme.min.css.map \ No newline at end of file diff --git a/src/web/static/css/bootstrap.min.css b/src/web/static/css/bootstrap.min.css index 9293a126..30c399cb 120000 --- a/src/web/static/css/bootstrap.min.css +++ b/src/web/static/css/bootstrap.min.css @@ -1 +1 @@ -../../../../submodules/bootstrap/dist/css/bootstrap.min.css \ No newline at end of file +../bower_components/bootstrap/dist/css/bootstrap.min.css \ No newline at end of file diff --git a/src/web/static/css/bootstrap.min.css.map b/src/web/static/css/bootstrap.min.css.map index 655b0135..146f88dd 120000 --- a/src/web/static/css/bootstrap.min.css.map +++ b/src/web/static/css/bootstrap.min.css.map @@ -1 +1 @@ -../../../../submodules/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file +../bower_components/bootstrap/dist/css/bootstrap.min.css.map \ No newline at end of file diff --git a/src/web/static/fonts b/src/web/static/fonts index 0061ad7b..4097ea8b 120000 --- a/src/web/static/fonts +++ b/src/web/static/fonts @@ -1 +1 @@ -../../../submodules/bootstrap/dist/fonts/ \ No newline at end of file +bower_components/bootstrap/dist/fonts/ \ No newline at end of file diff --git a/submodules/bootstrap b/submodules/bootstrap deleted file mode 160000 index bb554265..00000000 --- a/submodules/bootstrap +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bb5542651d89ba4c26950d349f74845d0d3384a3 -- cgit