Blob Blame History Raw
diff -rupN --no-dereference pgadmin4-8.5/requirements.txt pgadmin4-8.5-new/requirements.txt
--- pgadmin4-8.5/requirements.txt	2024-04-01 13:34:04.000000000 +0200
+++ pgadmin4-8.5-new/requirements.txt	2024-04-11 12:33:47.385653152 +0200
@@ -8,58 +8,50 @@
 #
 ###############################################################################
 
-Flask==2.3.*; python_version > '3.7'
-Flask==2.2.*; python_version <= '3.7'
+Flask>=2.3.0
 Flask-Gravatar==0.*
 Flask-Login==0.*
 Flask-Mail==0.*
 Flask-Migrate==4.*
 greenlet==1.1.2;  python_version <= '3.10'
-Flask-SQLAlchemy==3.1.*; python_version > '3.7'
-Flask-SQLAlchemy==3.0.*; python_version <= '3.7'
+Flask-SQLAlchemy>=3.0.0
 Flask-WTF==1.2.*; python_version > '3.7'
 Flask-WTF==1.1.1; python_version <= '3.7'
 Flask-Compress==1.*
 Flask-Paranoid==0.*
-Flask-Babel==4.0.*; python_version > '3.7'
-Flask-Babel==3.1.*; python_version <= '3.7'
-Flask-Security-Too==5.3.*; python_version > '3.7'
-Flask-Security-Too==5.1.*; python_version <= '3.7'
+Flask-Babel>=3.1.0
+Flask-Security-Too>=5.2.0
 Flask-SocketIO==5.3.*
-WTForms==3.1.*; python_version > '3.7'
-WTForms==3.0.*; python_version <= '3.7'
+WTForms>=3.0.0
 passlib==1.*
-pytz==2023.*
-speaklater3==1.*
+pytz>=2023
 sqlparse==0.*
 psutil==5.9.*
-psycopg[c]==3.1.12
+psycopg>=3.1.12
 python-dateutil==2.*
-SQLAlchemy==2.*
-bcrypt==4.0.*
-cryptography==42.0.*
+SQLAlchemy>=1.4.0
+bcrypt>=4.0.0
+cryptography>=41.0.0
 sshtunnel==0.*
 ldap3==2.*
-gssapi==1.8.*
-eventlet==0.34.2
+gssapi>=1.7.0
+eventlet>=0.33.3
 httpagentparser==1.9.*
 user-agents==2.2.0
 pywinpty==2.0.*; sys_platform=="win32"
-Authlib==1.2.*
+Authlib>=1.2.0
 pyotp==2.*
 qrcode==7.*
-boto3==1.33.*
+boto3>=1.33.0
 urllib3==1.26.*
-azure-mgmt-rdbms==10.1.0
-azure-mgmt-resource==23.0.1
-azure-mgmt-subscription==3.1.1
-azure-identity==1.15.0
+azure-mgmt-rdbms>=10.1.0
+azure-mgmt-resource>=23.0.1
+azure-mgmt-subscription>=3.0.0
+azure-identity>=1.10.0
 google-api-python-client==2.*
-google-auth-oauthlib==1.1.0
-keyring==24.*; python_version > '3.7'
-keyring==23.*; python_version <= '3.7'
-Werkzeug==2.3.*; python_version > '3.7'
-Werkzeug==2.2.3; python_version <= '3.7'
-typer[all]==0.9.*
-setuptools==69.*; python_version >= '3.12'
+google-auth-oauthlib>=0.8.0
+keyring>=24.0.0
+Werkzeug>=2.3.0
+typer[all]>=0.9.0
+setuptools>=68.0
 jsonformatter~=0.3.2
diff -rupN --no-dereference pgadmin4-8.5/web/pgadmin/authenticate/mfa/email.py pgadmin4-8.5-new/web/pgadmin/authenticate/mfa/email.py
--- pgadmin4-8.5/web/pgadmin/authenticate/mfa/email.py	2024-04-01 13:34:04.000000000 +0200
+++ pgadmin4-8.5-new/web/pgadmin/authenticate/mfa/email.py	2024-04-11 12:33:47.385653152 +0200
@@ -12,7 +12,7 @@ from flask import url_for, session, Resp
     flash
 from flask_babel import gettext as _
 from flask_login import current_user
-from flask_security import send_mail
+from flask_security.utils import send_mail
 
 import config
 from pgadmin.utils.csrf import pgCSRFProtect