diff --git a/check_process b/check_process index 3bfc8ff..b570167 100644 --- a/check_process +++ b/check_process @@ -17,7 +17,7 @@ setup_public=1 upgrade=1 #Last version - upgrade=1 from_commit=df304aadd7767a3e38bfc6d4da45ce8a94ebc749 + upgrade=1 from_commit=79c6c4ad03f62d2ed4f4180ac6b7dac1c117a62a #v0.6.6 # upgrade=1 from_commit=11f5b96df7d8850beff47f9904745fa53a6f7ed9 backup_restore=1 diff --git a/conf/app.src b/conf/app.src index 7c29e65..c1d3c84 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.14/calibre-web-0.6.14.zip -SOURCE_SUM=df772c692bfa42d3d4293b531133c833b0f4d427267e784c32b4678bb5a1b753 +SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.16/calibre-web-0.6.16.zip +SOURCE_SUM=7f9f1217b0010625765796c2122bd941b23f9d1a99f83eb6c9c4c9fa3cb2dcbc SOURCE_FORMAT=zip diff --git a/manifest.json b/manifest.json index 6d6bdf6..97786d4 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.14~ynh1", + "version": "0.96.16~ynh1", "url": "https://github.com/janeczku/calibre-web", "upstream": { - "version": "0.6.14", + "version": "0.6.16", "license": "GPL-3.0-only", "admindoc": "https://github.com/janeczku/calibre-web/wiki", "code": "https://github.com/janeczku/calibre-web" diff --git a/sources/patches/app-admin.html.patch b/sources/patches/app-admin.html.patch index ce4e067..5dedd55 100644 --- a/sources/patches/app-admin.html.patch +++ b/sources/patches/app-admin.html.patch @@ -1,11 +1,10 @@ ---- 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 @@ +--- a/cps/templates/admin.html 2022-01-24 19:18:40.000000000 +0100 ++++ b/cps/templates/admin.html 2022-01-26 23:47:53.669309039 +0100 +@@ -189,11 +189,6 @@ - + - {% if feature_support['updater'] %} -- - -
{{_('Check for Update')}}
- diff --git a/sources/patches/app-optional-requirements.txt.patch b/sources/patches/app-optional-requirements.txt.patch index 5fbef2b..0df4493 100644 --- a/sources/patches/app-optional-requirements.txt.patch +++ b/sources/patches/app-optional-requirements.txt.patch @@ -1,35 +1,34 @@ ---- 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 +--- a/optional-requirements.txt 2022-01-24 19:18:40.000000000 +0100 ++++ b/optional-requirements.txt 2022-01-26 23:46:47.077607055 +0100 +@@ -1,20 +1,5 @@ + # GDrive Integration +-google-api-python-client>=1.7.11,<2.37.0 + gevent>20.6.0,<22.0.0 -greenlet>=0.4.17,<1.2.0 --httplib2>=0.9.2,<0.20.0 +-httplib2>=0.9.2,<0.21.0 -oauth2client>=4.0.0,<4.1.4 --uritemplate>=3.0.0,<3.1.0 +-uritemplate>=3.0.0,<4.2.0 -pyasn1-modules>=0.0.8,<0.3.0 -pyasn1>=0.1.9,<0.5.0 --PyDrive2>=1.3.1,<1.9.0 +-PyDrive2>=1.3.1,<1.11.0 -PyYAML>=3.12 --rsa>=3.4.2,<4.8.0 +-rsa>=3.4.2,<4.9.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 +-google-api-python-client>=1.7.11,<2.37.0 # goodreads goodreads>=0.3.2,<0.4.0 -@@ -25,10 +7,6 @@ - python-ldap>=3.0.0,<3.4.0 +@@ -24,10 +9,6 @@ + python-ldap>=3.0.0,<3.5.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 +-# oauth +-Flask-Dance>=2.0.0,<5.2.0 +-SQLAlchemy-Utils>=0.33.5,<0.39.0 - - # extracting metadata + # metadata extraction rarfile>=2.7 - scholarly>=1.2.0, <1.3 + scholarly>=1.2.0,<1.6