[arch-commits] Commit in pgadmin4/trunk (3 files)

[Jelle van der Waa]

    Date: Sunday, October 3, 2021 @ 17:22:16
  Author: jelle
Revision: 1027210

python-sqlalchemy rebuild

As there is no compatibilty yet for 1.4 most likely depend on 1.3

Added:
  pgadmin4/trunk/flask-security-compat.patch
  pgadmin4/trunk/flask2-compat.patch
Modified:
  pgadmin4/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   14 ++++++++++----
 flask-security-compat.patch |   30 ++++++++++++++++++++++++++++++
 flask2-compat.patch         |   14 ++++++++++++++
 3 files changed, 54 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-03 16:46:27 UTC (rev 1027209)
+++ PKGBUILD	2021-10-03 17:22:16 UTC (rev 1027210)
@@ -3,7 +3,7 @@
 
 pkgname=pgadmin4
 pkgver=4.30
-pkgrel=1
+pkgrel=2
 pkgdesc='Comprehensive design and management interface for PostgreSQL'
 url='https://www.pgadmin.org/'
 arch=('x86_64')
@@ -15,7 +15,7 @@
          'python-passlib' 'python-pytz' 'python-simplejson' 'python-six'
          'python-speaklater' 'python-sqlparse' 'python-wtforms' 'python-psutil'
          'python-jinja' 'python-paramiko' 'python-psycopg2' 'python-bcrypt'
-         'python-cryptography' 'python-sqlalchemy' 'python-testtools'
+         'python-cryptography' 'python-sqlalchemy1.3' 'python-testtools'
          'python-webencodings' 'python-werkzeug' 'python-dateutil'
          'python-flask-gravatar' 'python-flask-mail' 'python-flask-principal'
          'python-flask-paranoid' 'python-sshtunnel' 'python-flask-security-too'
@@ -28,7 +28,9 @@
         pgAdmin4.desktop
         config_distro.py
         config_local.py
-        pgadmin4-python-de-vendor-venv-paths.patch)
+        pgadmin4-python-de-vendor-venv-paths.patch
+        flask-security-compat.patch
+        flask2-compat.patch)
 validpgpkeys=('E8697E2EEF76C02D3A6332778881B2A8210976F2') # Package Manager (Package Signing Key) <packages at pgadmin.org>
 sha512sums=('7ce12f65ce9dbfe4af9e92dd7f9327a05be8b8436ef495a0634043158417f3af5f457b88ee5422ede59f517c197668094454c6d7b7c33e255068479ce6ec13d9'
             'SKIP'
@@ -35,12 +37,16 @@
             'b19dda3331585010c759099eb09f4db288ce4cd3d36882b56748e1e3756dc7bee2899d7438d496280498ec6a60f6e1ba90309d49fc599403f1fdc7e8817b6645'
             '16d00dc2095904a6b12da7039458f632873829ad98d4d7653eac5804032ba92097ccae4488d56467d0ea9bd64e2654a3dead73eb7924c947ff1737ff6e3b4745'
             'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
-            'a8c1a3762469b02b745da4e3b30f7534ad6bb94e91d43f7e63604fef24f638e09575e2c9336e753e5b6dbe167c55bb49fb6247a16431415318479eb3a3712adc')
+            'a8c1a3762469b02b745da4e3b30f7534ad6bb94e91d43f7e63604fef24f638e09575e2c9336e753e5b6dbe167c55bb49fb6247a16431415318479eb3a3712adc'
+            '8b23686674c12f1bbba9ded22425874adb5f6802f2e1f7e381c07208251301f0bb56622a0440e5609c5dcc5461f50fe08c7dcab4405878e9662de6faf782a39b'
+            '5eb39b2926adc7fe715a2b1b3f2165bd84a9fab3f8afda1ddaaba557ad1d41a4aa8d279387699b7148a86c7af4782d5b6b7f50f89972ef3507d14795c006a65c')
 
 prepare() {
   cd ${pkgname}-${pkgver}
 
   patch -Np1 < ../pgadmin4-python-de-vendor-venv-paths.patch
+  patch -NRp1 < ../flask-security-compat.patch
+  patch -NRp1 < ../flask2-compat.patch
 
   local PYTHONVERSION="$(python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')"
   sed -E "s|/usr/pgadmin4/web|/usr/lib/pgadmin4/web|g;

Added: flask-security-compat.patch
===================================================================
--- flask-security-compat.patch	                        (rev 0)
+++ flask-security-compat.patch	2021-10-03 17:22:16 UTC (rev 1027210)
@@ -0,0 +1,30 @@
+diff -aur pgadmin4-4.30/web/pgadmin/browser/__init__.py pgadmin4-4.30.old/web/pgadmin/browser/__init__.py
+--- pgadmin4-4.30/web/pgadmin/browser/__init__.py	2021-10-03 19:00:39.757955280 +0200
++++ pgadmin4-4.30.old/web/pgadmin/browser/__init__.py	2021-10-03 18:59:22.220450894 +0200
+@@ -30,7 +30,7 @@
+ from flask_security.signals import reset_password_instructions_sent
+ from flask_security.utils import config_value, do_flash, get_url, \
+     get_message, slash_url_suffix, login_user, send_mail, logout_user
+-from flask_security.views import _security, view_commit, _ctx
++from flask_security.views import _security, _commit, _ctx
+ from werkzeug.datastructures import MultiDict
+ 
+ import config
+@@ -1039,7 +1039,7 @@
+                 has_error = True
+ 
+             if request.json is None and not has_error:
+-                after_this_request(view_commit)
++                after_this_request(_commit)
+                 do_flash(*get_message('PASSWORD_CHANGE'))
+ 
+                 old_key = get_crypt_key()[1]
+@@ -1205,7 +1205,7 @@
+                 has_error = True
+ 
+             if not has_error:
+-                after_this_request(view_commit)
++                after_this_request(_commit)
+                 do_flash(*get_message('PASSWORD_RESET'))
+                 login_user(user)
+                 return redirect(get_url(_security.post_reset_view) or

Added: flask2-compat.patch
===================================================================
--- flask2-compat.patch	                        (rev 0)
+++ flask2-compat.patch	2021-10-03 17:22:16 UTC (rev 1027210)
@@ -0,0 +1,14 @@
+diff -aur pgadmin4-4.30/web/pgadmin/browser/utils.py pgadmin4-4.30.old/web/pgadmin/browser/utils.py
+--- pgadmin4-4.30/web/pgadmin/browser/utils.py	2021-10-03 19:12:11.176725436 +0200
++++ pgadmin4-4.30.old/web/pgadmin/browser/utils.py	2021-10-03 19:04:26.747074705 +0200
+@@ -13,9 +13,8 @@
+ 
+ import flask
+ from flask import render_template, current_app
+-from flask.views import View, MethodViewType
++from flask.views import View, MethodViewType, with_metaclass
+ from flask_babelex import gettext
+-from six import with_metaclass
+ 
+ from config import PG_DEFAULT_DRIVER
+ from pgadmin.utils.ajax import make_json_response, precondition_required,\