Update patch to last version

sources/patches/app-admin.html.patch

@@ -2,7 +2,7 @@
 +++ b/cps/templates/admin.html	2020-04-18 18:21:39.272422475 +0200
 @@ -149,8 +149,6 @@
        </table>
- 
+
        <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
 -      <div class="btn btn-default" id="check_for_update">{{_('Check for Update')}}</div>
 -      <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#StatusDialog">{{_('Perform Update')}}</div>

sources/patches/app-admin.patch

@@ -1,11 +0,0 @@
---- a/cps/templates/admin.html	2019-02-05 21:21:55.615940498 +0100
-+++ b/cps/templates/admin.html	2019-02-05 21:23:29.171461028 +0100
-@@ -129,7 +129,7 @@
-       </table>
- 
-       <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
--      <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>
-+      <!--<div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>-->
-       <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#UpdateprogressDialog">{{_('Perform Update')}}</div>
-     </div>
-   </div>

sources/patches/app-optional-requirements.patch

@@ -1,5 +1,5 @@
---- a/optional-requirements.txt	2020-04-15 22:03:21.000000000 +0200
+--- a/optional-requirements.txt	2020-04-28 15:33:25.000000000 +0200
-+++ b/optional-requirements.txt	2020-04-16 20:44:43.371235411 +0200
++++ b/optional-requirements.txt	2020-05-03 13:59:23.067375502 +0200
 @@ -1,17 +1,3 @@
 -# GDrive Integration
 -google-api-python-client==1.7.11,<1.8.0
@@ -19,12 +19,12 @@
  goodreads>=0.3.2,<0.4.0
  python-Levenshtein>=0.12.0,<0.13.0
 @@ -20,19 +6,11 @@
- python_ldap>=3.0.0,<3.3.0
+ python-ldap>=3.0.0,<3.3.0
- flask-simpleldap>=1.4.0,<1.5.0
+ Flask-SimpleLDAP>=1.4.0,<1.5.0
  
 -#oauth
--flask-dance>=1.4.0,<3.1.0
+-Flask-Dance>=1.4.0,<3.1.0
--sqlalchemy_utils>=0.33.5,<0.37.0
+-SQLAlchemy-Utils>=0.33.5,<0.37.0
 -
  # extracting metadata
  lxml>=3.8.0,<4.6.0

sources/patches/app-web.py.patch

@@ -1,17 +1,18 @@
---- a/cps/web.py	2020-05-01 13:54:41.755888435 +0200
+--- a/cps/web.py	2020-04-28 15:33:25.000000000 +0200
-+++ b/cps/web.py"	2020-05-01 14:03:01.337768210 +0200
++++ b/cps/web.py	2020-05-03 14:12:19.028083695 +0200
-@@ -281,6 +281,10 @@
+@@ -281,7 +281,10 @@
      if not config.db_configured and request.endpoint not in (
          'admin.basic_configuration', 'login') and '/static/' not in request.path:
          return redirect(url_for('admin.basic_configuration'))
+-
 +#Début Modif Yunohost 1/4
 +    if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
 +        import_ldap_users()
 +#Fin Modif Yunohost 1/4
  
- 
  @app.route('/import_ldap_users')
-@@ -313,7 +317,10 @@
+ def import_ldap_users():
+@@ -313,7 +316,10 @@
                  log.warning("Could Not Parse LDAP User: %s", user)
                  continue
          if ub.session.query(ub.User).filter(ub.User.nickname == user.lower()).first():
@@ -23,7 +24,7 @@
              continue
          user_data = services.ldap.get_object_details(user=user,
                                                       group=None,
-@@ -1216,6 +1223,10 @@
+@@ -1217,6 +1223,10 @@
      if not config.db_configured:
          log.debug(u"Redirect to initial configuration")
          return redirect(url_for('admin.basic_configuration'))
@@ -34,7 +35,7 @@
      if current_user is not None and current_user.is_authenticated:
          return redirect(url_for('web.index'))
      if config.config_login_type == constants.LOGIN_LDAP and not services.ldap:
-@@ -1290,8 +1301,13 @@
+@@ -1291,8 +1301,13 @@
          if feature_support['oauth'] and (config.config_login_type == 2 or config.config_login_type == 3):
              logout_oauth_user()
      log.debug(u"User logged out")