From a09e63d546fe216c55efb73f2564248d9659cc92 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 28 Jan 2023 15:06:46 +0100 Subject: [PATCH 1/6] add "requests" dependency --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3dc22d9..e0d6494 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES # dependencies used by the app (must be on a single line) -pkg_dependencies="python3-venv" +pkg_dependencies="python3-venv python3-requests" #================================================= # PERSONAL HELPERS From 305072e1eb3a63bec96c5e0c6e12125a5f426366 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 28 Jan 2023 15:17:28 +0100 Subject: [PATCH 2/6] remove python3-request debian package (should be venv) --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e0d6494..3dc22d9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES # dependencies used by the app (must be on a single line) -pkg_dependencies="python3-venv python3-requests" +pkg_dependencies="python3-venv" #================================================= # PERSONAL HELPERS From e2582ec7b4aa01ff731f3b05a480571a393f8723 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 28 Jan 2023 15:18:53 +0100 Subject: [PATCH 3/6] add requests dependency --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 27ae58a..0c63680 100755 --- a/scripts/install +++ b/scripts/install @@ -87,6 +87,7 @@ pushd $final_path python3 -m venv venv venv/bin/pip install --upgrade pip venv/bin/pip install -r requirements.txt # should only be flask for now, but just in case + venv/bin/pip install requests popd #================================================= From 9315b124b8e66c398c846669a235f7db398ed838 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 28 Jan 2023 15:20:10 +0100 Subject: [PATCH 4/6] python dependencies on upgrade Including `requests` --- scripts/upgrade | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 9ca2306..e7e66ea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -126,6 +126,19 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=1 ynh_install_app_dependencies $pkg_dependencies +#================================================= +# INSTALL PYTHON DEPENDENCIES +#================================================= + +ynh_script_progression --message="Installing python dependencies..." --weight=1 + +pushd $final_path + python3 -m venv venv + venv/bin/pip install --upgrade pip + venv/bin/pip install -r requirements.txt # should only be flask for now, but just in case + venv/bin/pip install requests +popd + #================================================= # NGINX CONFIGURATION #================================================= From 7c9f9f13dbcb9ed0a754b21cb927c12c6210eb66 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 28 Jan 2023 15:20:27 +0100 Subject: [PATCH 5/6] bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 19c7cb3..1a4dc89 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Bypass paywall by acting as GoogleBot", "fr": "Contourner les paywall en vous faisant passer pour GoogleBot" }, - "version": "0.1.1~ynh4", + "version": "0.1.1~ynh5", "url": "https://github.com/wasi-master/13ft", "upstream": { "license": "MIT", From c2a85935396ea63374c7376f03d5b1cd86f8cc81 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 28 Jan 2023 14:20:30 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e1ac954..b937241 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ https://github.com/wasi-master/13ft - Provide *some* web articles that are normally protected by paywalls. -**Shipped version:** 0.1.1~ynh4 +**Shipped version:** 0.1.1~ynh5 ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 9506ba3..eb91bb3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ https://github.com/wasi-master/13ft - Provide *some* web articles that are normally protected by paywalls. -**Version incluse :** 0.1.1~ynh4 +**Version incluse :** 0.1.1~ynh5 ## Avertissements / informations importantes