From 684c22c35eeafb9121fa4d28e480fd5bb3b6c1a9 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:52:51 +0100 Subject: [PATCH 1/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 15cd1d6..8900143 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Browsing, reading and downloading eBooks using a Calibre database -**Shipped version:** 0.6.13 +**Shipped version:** 0.6.14 @@ -103,4 +103,4 @@ or sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** https://yunohost.org/packaging_apps From 583fd618f5c04279814fee5cd48acb236def6701 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:53:13 +0100 Subject: [PATCH 2/8] Update README_fr.md --- README_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index a5940a1..da4d174 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre -**Version incluse :** 0.6.13 +**Version incluse :** 0.6.14 @@ -99,4 +99,4 @@ ou sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps From 0aacd56f8711ed8a6f9e24ef79f404fe399825e5 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:54:49 +0100 Subject: [PATCH 3/8] Update app.src --- conf/app.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index b321ae3..7c29e65 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.13/calibre-web-0.6.13.zip -SOURCE_SUM=35ddfda60cc902d325424b5deffb104b8692f26a9e9e634d4ad7d83406018050 -SOURCE_FORMAT=zip \ No newline at end of file +SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.14/calibre-web-0.6.14.zip +SOURCE_SUM=df772c692bfa42d3d4293b531133c833b0f4d427267e784c32b4678bb5a1b753 +SOURCE_FORMAT=zip From 722e915e5bcf6569a333d9402b51a6a5acb4314a Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:57:07 +0100 Subject: [PATCH 4/8] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 8b23834..42cab9d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,10 +6,10 @@ "en": "Browsing, reading and downloading eBooks using a Calibre database", "fr": "Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre" }, - "version": "0.96.13~ynh1", + "version": "0.96.14~ynh1", "url": "https://github.com/janeczku/calibre-web", "upstream": { - "version": "0.6.13", + "version": "0.6.14", "license": "GPL-3.0-only", "admindoc": "https://github.com/janeczku/calibre-web/wiki", "code": "https://github.com/janeczku/calibre-web" From 85edc4d141d9aa21a3c03a0d718c282e3ae5c07e Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Tue, 2 Nov 2021 18:24:27 +0100 Subject: [PATCH 5/8] Update app-optional-requirements.txt.patch --- .../app-optional-requirements.txt.patch | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/sources/patches/app-optional-requirements.txt.patch b/sources/patches/app-optional-requirements.txt.patch index 6be1da6..e82b3a1 100644 --- a/sources/patches/app-optional-requirements.txt.patch +++ b/sources/patches/app-optional-requirements.txt.patch @@ -1,36 +1,44 @@ --- a/optional-requirements.txt 2021-05-22 14:08:46.000000000 +0200 +++ b/optional-requirements.txt 2021-06-06 10:47:53.012009447 +0200 @@ -1,22 +1,3 @@ --# GDrive Integration --gevent>20.6.0,<21.2.0 --greenlet>=0.4.17,<1.2.0 --httplib2>=0.9.2,<0.20.0 --oauth2client>=4.0.0,<4.1.4 --uritemplate>=3.0.0,<3.1.0 --pyasn1-modules>=0.0.8,<0.3.0 --pyasn1>=0.1.9,<0.5.0 --PyDrive2>=1.3.1,<1.9.0 --PyYAML>=3.12 --rsa>=3.4.2,<4.8.0 --six>=1.10.0,<1.17.0 -- --# Gdrive and Gmail integration --google-api-python-client>=1.7.11,<2.1.0 -- --# Gmail --google-auth-oauthlib>=0.4.3,<0.5.0 -- - # goodreads - goodreads>=0.3.2,<0.4.0 - python-Levenshtein>=0.12.0,<0.13.0 -@@ -25,10 +6,6 @@ - python-ldap>=3.0.0,<3.4.0 - Flask-SimpleLDAP>=1.4.0,<1.5.0 - --#oauth --Flask-Dance>=2.0.0,<5.1.0 --SQLAlchemy-Utils>=0.33.5,<0.38.0 -- - # extracting metadata - lxml>=3.8.0,<4.7.0 - rarfile>=2.7 +# GDrive Integration +gevent>20.6.0,<22.0.0 +greenlet>=0.4.17,<1.2.0 +httplib2>=0.9.2,<0.20.0 +oauth2client>=4.0.0,<4.1.4 +uritemplate>=3.0.0,<3.1.0 +pyasn1-modules>=0.0.8,<0.3.0 +pyasn1>=0.1.9,<0.5.0 +PyDrive2>=1.3.1,<1.9.0 +PyYAML>=3.12 +rsa>=3.4.2,<4.8.0 +six>=1.10.0,<1.17.0 + +# Gdrive and Gmail integration +google-api-python-client>=1.7.11,<2.1.0 + +# Gmail +google-auth-oauthlib>=0.4.3,<0.5.0 + +# goodreads +goodreads>=0.3.2,<0.4.0 +python-Levenshtein>=0.12.0,<0.13.0 + +# ldap login +python-ldap>=3.0.0,<3.4.0 +Flask-SimpleLDAP>=1.4.0,<1.5.0 + +#oauth +Flask-Dance>=2.0.0,<5.1.0 +SQLAlchemy-Utils>=0.33.5,<0.38.0 + +# extracting metadata +rarfile>=2.7 +scholarly>=1.2.0, <1.3 + +# other +natsort>=2.2.0,<7.2.0 +comicapi>= 2.2.0,<2.3.0 + +#Kobo integration +jsonschema>=3.2.0,<3.3.0 From 4640c52c20beda048359a613d4dd28e900229739 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 5 Nov 2021 18:10:05 +0000 Subject: [PATCH 6/8] 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 8900143..6dc4204 100644 --- a/README.md +++ b/README.md @@ -103,4 +103,4 @@ or sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index da4d174..efb2683 100644 --- a/README_fr.md +++ b/README_fr.md @@ -99,4 +99,4 @@ ou sudo yunohost app upgrade calibreweb -u https://github.com/YunoHost-Apps/calibreweb_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From cc41f20752a7a4251ee0deff3d8b90b87d52e46d Mon Sep 17 00:00:00 2001 From: Krakinou Date: Fri, 5 Nov 2021 19:33:34 +0100 Subject: [PATCH 7/8] Update to 0.6.14 --- ...-admin.hmtl.patch => app-admin.html.patch} | 8 +- .../app-optional-requirements.txt.patch | 79 ++++++++----------- 2 files changed, 39 insertions(+), 48 deletions(-) rename sources/patches/{app-admin.hmtl.patch => app-admin.html.patch} (67%) diff --git a/sources/patches/app-admin.hmtl.patch b/sources/patches/app-admin.html.patch similarity index 67% rename from sources/patches/app-admin.hmtl.patch rename to sources/patches/app-admin.html.patch index dd2411d..9dd4f23 100644 --- a/sources/patches/app-admin.hmtl.patch +++ b/sources/patches/app-admin.html.patch @@ -1,15 +1,15 @@ ---- a/cps/templates/admin.html 2021-05-22 14:08:46.000000000 +0200 -+++ b/cps/templates/admin.html 2021-06-06 12:43:44.886680839 +0200 -@@ -184,11 +184,7 @@ +--- a/cps/admin.html 2021-10-31 11:31:53.000000000 +0100 ++++ b/cps/admin.html 2021-11-05 19:22:28.554122091 +0100 +@@ -185,12 +185,6 @@ - {% if feature_support['updater'] %} +- - -
{{_('Check for Update')}}
- - {% endif %} -+ diff --git a/sources/patches/app-optional-requirements.txt.patch b/sources/patches/app-optional-requirements.txt.patch index e82b3a1..5fbef2b 100644 --- a/sources/patches/app-optional-requirements.txt.patch +++ b/sources/patches/app-optional-requirements.txt.patch @@ -1,44 +1,35 @@ ---- a/optional-requirements.txt 2021-05-22 14:08:46.000000000 +0200 -+++ b/optional-requirements.txt 2021-06-06 10:47:53.012009447 +0200 -@@ -1,22 +1,3 @@ -# GDrive Integration -gevent>20.6.0,<22.0.0 -greenlet>=0.4.17,<1.2.0 -httplib2>=0.9.2,<0.20.0 -oauth2client>=4.0.0,<4.1.4 -uritemplate>=3.0.0,<3.1.0 -pyasn1-modules>=0.0.8,<0.3.0 -pyasn1>=0.1.9,<0.5.0 -PyDrive2>=1.3.1,<1.9.0 -PyYAML>=3.12 -rsa>=3.4.2,<4.8.0 -six>=1.10.0,<1.17.0 - -# Gdrive and Gmail integration -google-api-python-client>=1.7.11,<2.1.0 - -# Gmail -google-auth-oauthlib>=0.4.3,<0.5.0 - -# goodreads -goodreads>=0.3.2,<0.4.0 -python-Levenshtein>=0.12.0,<0.13.0 - -# ldap login -python-ldap>=3.0.0,<3.4.0 -Flask-SimpleLDAP>=1.4.0,<1.5.0 - -#oauth -Flask-Dance>=2.0.0,<5.1.0 -SQLAlchemy-Utils>=0.33.5,<0.38.0 - -# extracting metadata -rarfile>=2.7 -scholarly>=1.2.0, <1.3 - -# other -natsort>=2.2.0,<7.2.0 -comicapi>= 2.2.0,<2.3.0 - -#Kobo integration -jsonschema>=3.2.0,<3.3.0 +--- a/optional-requirements.txt 2021-10-31 11:31:53.000000000 +0100 ++++ b/optional-requirements.txt 2021-11-05 19:27:25.664091168 +0100 +@@ -1,21 +1,3 @@ +-# GDrive Integration +-gevent>20.6.0,<22.0.0 +-greenlet>=0.4.17,<1.2.0 +-httplib2>=0.9.2,<0.20.0 +-oauth2client>=4.0.0,<4.1.4 +-uritemplate>=3.0.0,<3.1.0 +-pyasn1-modules>=0.0.8,<0.3.0 +-pyasn1>=0.1.9,<0.5.0 +-PyDrive2>=1.3.1,<1.9.0 +-PyYAML>=3.12 +-rsa>=3.4.2,<4.8.0 +-six>=1.10.0,<1.17.0 +- +-# Gdrive and Gmail integration +-google-api-python-client>=1.7.11,<2.1.0 +- +-# Gmail +-google-auth-oauthlib>=0.4.3,<0.5.0 + + # goodreads + goodreads>=0.3.2,<0.4.0 +@@ -25,10 +7,6 @@ + python-ldap>=3.0.0,<3.4.0 + Flask-SimpleLDAP>=1.4.0,<1.5.0 + +-#oauth +-Flask-Dance>=2.0.0,<5.1.0 +-SQLAlchemy-Utils>=0.33.5,<0.38.0 +- + # extracting metadata + rarfile>=2.7 + scholarly>=1.2.0, <1.3 From f79380c571f711e308d66b9fb1ffd744087ff4d9 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 6 Nov 2021 16:53:15 +0100 Subject: [PATCH 8/8] wrong path --- sources/patches/app-admin.html.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/patches/app-admin.html.patch b/sources/patches/app-admin.html.patch index 9dd4f23..ce4e067 100644 --- a/sources/patches/app-admin.html.patch +++ b/sources/patches/app-admin.html.patch @@ -1,5 +1,5 @@ ---- a/cps/admin.html 2021-10-31 11:31:53.000000000 +0100 -+++ b/cps/admin.html 2021-11-05 19:22:28.554122091 +0100 +--- a/cps/templates/admin.html 2021-10-31 11:31:53.000000000 +0100 ++++ b/cps/templates/admin.html 2021-11-05 19:22:28.554122091 +0100 @@ -185,12 +185,6 @@