- Update JS packages.

- Remove support for Python 3.7 as Debian 10 is EOL.

requirements.txt

@@ -8,25 +8,19 @@
 #
 ###############################################################################
 
-Flask==3.0.*; python_version > '3.7'
-Flask==2.2.*; python_version <= '3.7'
+Flask==3.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-WTF==1.2.*; python_version > '3.7'
-Flask-WTF==1.1.1; python_version <= '3.7'
+Flask-SQLAlchemy==3.1.*
+Flask-WTF==1.2.*;
 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.4.*; python_version > '3.7'
-Flask-Security-Too==5.1.*; python_version <= '3.7'
+Flask-Babel==4.0.*
+Flask-Security-Too==5.4.*
 Flask-SocketIO==5.3.*
-WTForms==3.1.*; python_version > '3.7'
-WTForms==3.0.*; python_version <= '3.7'
+WTForms==3.1.*
 passlib==1.*
 pytz==2024.*
 speaklater3==1.*
@@ -44,8 +38,7 @@ eventlet==0.36.1
 httpagentparser==1.9.*
 user-agents==2.2.0
 pywinpty==2.0.*; sys_platform=="win32"
-Authlib==1.3.*; python_version > '3.7'
-Authlib==1.2.*; python_version <= '3.7'
+Authlib==1.3.*
 pyotp==2.*
 qrcode==7.*
 boto3==1.34.*
@@ -56,10 +49,8 @@ azure-mgmt-subscription==3.1.1
 azure-identity==1.15.0
 google-api-python-client==2.*
 google-auth-oauthlib==1.2.0
-keyring==24.*; python_version > '3.7'
-keyring==23.*; python_version <= '3.7'
-Werkzeug==3.0.*; python_version > '3.7'
-Werkzeug==2.2.3; python_version <= '3.7'
+keyring==24.*
+Werkzeug==3.0.*
 typer[all]==0.12.*
 setuptools==69.*; python_version >= '3.12'
 jsonformatter~=0.3.2

web/package.json

@@ -14,7 +14,7 @@
     "@babel/plugin-syntax-jsx": "^7.16.0",
     "@babel/plugin-transform-runtime": "^7.22.15",
     "@babel/preset-env": "^7.10.2",
-    "@babel/preset-typescript": "^7.22.5",
+    "@babel/preset-typescript": "^7.24.7",
     "@emotion/core": "^10.0.14",
     "@emotion/memoize": "^0.7.5",
     "@emotion/react": "^11.11.3",
@@ -25,8 +25,8 @@
     "@testing-library/react": "12",
     "@testing-library/user-event": "^14.4.3",
     "@types/jest": "^29.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.57.0",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
     "autoprefixer": "^10.2.4",
     "axios-mock-adapter": "^1.17.0",
     "babel-loader": "^8.1.0",
@@ -42,7 +42,7 @@
     "eslint-plugin-react-hooks": "^4.3.0",
     "exports-loader": "^4.0.0",
     "html-react-parser": "^5.0.6",
-    "image-minimizer-webpack-plugin": "^3.8.2",
+    "image-minimizer-webpack-plugin": "^4.0.2",
     "imagemin": "^8.0.1",
     "imagemin-mozjpeg": "^10.0.0",
     "imagemin-optipng": "^8.0.0",
@@ -62,7 +62,7 @@
     "svgo": "^2.7.0",
     "svgo-loader": "^2.2.0",
     "terser-webpack-plugin": "^5.1.1",
-    "typescript": "^4.9.5",
+    "typescript": "^5.4.5",
     "url-loader": "^4.1.1",
     "webfonts-loader": "^8.0.1",
     "webpack": "^5.88.2",
@@ -93,7 +93,7 @@
     "ajv": "^8.8.2",
     "anti-trojan-source": "^1.4.0",
     "aspen-decorations": "^1.0.2",
-    "axios": "^1.6.8",
+    "axios": "^1.7.2",
     "babelify": "~10.0.0",
     "bignumber.js": "^9.0.1",
     "brace": "^0.11.1",

web/pgAdmin4.wsgi

@@ -10,8 +10,8 @@
 import os
 import sys
 
-if sys.version_info < (3, 4):
-    raise Exception('This application must be run under Python 3.4 or later.')
+if sys.version_info < (3, 8):
+    raise Exception('This application must be run under Python 3.8 or later.')
 
 import builtins
 

web/pgadmin/__init__.py

@@ -520,13 +520,9 @@ def create_app(app_name=None):
 
     security.init_app(app, user_datastore)
 
-    # register custom unauthorised handler.
-    if sys.version_info < (3, 8):
-        app.login_manager.unauthorized_handler(pga_unauthorised)
-    else:
-        # Flask-Security-Too > 5.4.* requires custom unauth handeler
-        # to be registeres with it.
-        security.unauthn_handler(pga_unauthorised)
+    # Flask-Security-Too > 5.4.* requires custom unauthn handler
+    # to be registered with it.
+    security.unauthn_handler(pga_unauthorised)
 
     # Set the permanent session lifetime to the specified value in config file.
     app.permanent_session_lifetime = timedelta(

web/pgadmin/browser/__init__.py

@@ -65,13 +65,7 @@ from pgadmin.authenticate import AuthSourceManager
 from pgadmin.utils.exception import CryptKeyMissing
 
 from pgadmin.user_login_check import pga_login_required
-
-try:
-    from flask_security.views import default_render_json
-except ImportError as e:
-    # Support Flask-Security-Too == 3.2
-    if sys.version_info < (3, 8):
-        from flask_security.views import _render_json as default_render_json
+from flask_security.views import default_render_json
 
 MODULE_NAME = 'browser'
 BROWSER_STATIC = 'browser.static'
@@ -1107,9 +1101,7 @@ if hasattr(config, 'SECURITY_RECOVERABLE') and config.SECURITY_RECOVERABLE:
         has_error = False
         form_class = _security.forms.get('reset_password_form').cls
         form = form_class(request.form) if request.form else form_class()
-
-        if sys.version_info >= (3, 8):
-            form.user = user
+        form.user = user
 
         if form.validate_on_submit():
             try:

web/pgadmin/tools/user_management/__init__.py

@@ -11,9 +11,7 @@
 
 import json
 
-import sys
-if sys.version_info >= (3, 8):
-    from unicodedata import normalize, is_normalized
+from unicodedata import normalize, is_normalized
 
 from flask import render_template, request, \
     Response, abort, current_app, session
@@ -446,10 +444,6 @@ def normalise_password(password):
         'NFKD'
     )
 
-    # Remove check of Python version once Python 3.7 support ends
-    if sys.version_info < (3, 8):
-        return password
-
     return password if is_normalized(normalise_form, password) else\
         normalize(normalise_form, password)