Merge branch 'master' into GH-1926

Author: RohitBhati8269

.github/workflows/run-python-tests-epas.yml

@@ -39,6 +39,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Update python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
       - name: Setup the EDB APT repo on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |

.github/workflows/run-python-tests-pg.yml

@@ -28,6 +28,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Update python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
       - name: Setup the PGDG APT repo on Linux
         if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |

DEPENDENCIES

@@ -172,7 +172,7 @@ COPY --from=env-builder /venv /venv
 # Copy in the tools
 COPY --from=tool-builder /usr/local/pgsql /usr/local/
 COPY --from=pg17-builder /usr/local/lib/libpq.so.5.17 /usr/lib/
-COPY --from=pg17-builder /usr/lib/libzstd.so.1.5.6 /usr/lib/
+COPY --from=pg17-builder /usr/lib/libzstd.so.1.5.7 /usr/lib/
 COPY --from=pg17-builder /usr/lib/liblz4.so.1.10.0 /usr/lib/
 
 RUN ln -s libpq.so.5.17 /usr/lib/libpq.so.5 && \
@@ -192,7 +192,6 @@ COPY pkg/docker/entrypoint.sh /entrypoint.sh
 
 # License files
 COPY LICENSE /pgadmin4/LICENSE
-COPY DEPENDENCIES /pgadmin4/DEPENDENCIES
 
 # Install runtime dependencies and configure everything in one RUN step
 RUN apk add --no-cache \

Dockerfile

@@ -239,7 +239,6 @@ REM Main build sequence Ends
 
     ECHO Staging license files...
     COPY "%WD%\LICENSE" "%BUILDROOT%\" > nul || EXIT /B 1
-    COPY "%WD%\DEPENDENCIES" "%BUILDROOT%\" > nul || EXIT /B 1
 
     ECHO Creating config_distro.py
     ECHO SERVER_MODE = False > "%BUILDROOT%\web\config_distro.py"

Make.bat

@@ -12,6 +12,7 @@ notes for it.
    :maxdepth: 1
 
 
+   release_notes_9_5
    release_notes_9_4
    release_notes_9_3
    release_notes_9_2

docs/en_US/release_notes.rst

@@ -0,0 +1,35 @@
+***********
+Version 9.5
+***********
+
+Release date: 2025-06-26
+
+This release contains a number of bug fixes and new features since the release of pgAdmin 4 v9.4.
+
+Supported Database Servers
+**************************
+**PostgreSQL**: 13, 14, 15, 16 and 17
+
+**EDB Advanced Server**: 13, 14, 15, 16 and 17
+
+Bundled PostgreSQL Utilities
+****************************
+**psql**, **pg_dump**, **pg_dumpall**, **pg_restore**: 17.2
+
+
+New features
+************
+
+  | `Issue #8665 <https://github.com/pgadmin-org/pgadmin4/issues/8665>`_ -  Supports JSON logging for gunicorn process within Docker.
+
+Housekeeping
+************
+
+
+Bug fixes
+*********
+
+  | `Issue #6118 <https://github.com/pgadmin-org/pgadmin4/issues/6118>`_ -  Improved PL/pgSQL code folding and support nested blocks.
+  | `Issue #7466 <https://github.com/pgadmin-org/pgadmin4/issues/7466>`_ -  Fixed an issue where utilities such as pg_dump and pg_restore failed to log error messages when required dependency files were missing.
+  | `Issue #8032 <https://github.com/pgadmin-org/pgadmin4/issues/8032>`_ -  Fixed an issue where the Schema Diff Tool incorrectly reported differences due to variations in the order of the privileges.
+  | `Issue #8691 <https://github.com/pgadmin-org/pgadmin4/issues/8691>`_ -  Fixed an issue in the query tool where using multiple cursors to copy text resulted in only the first line being copied.

docs/en_US/release_notes_9_5.rst

@@ -1,2 +1,45 @@
 import gunicorn
-gunicorn.SERVER_SOFTWARE = 'Python'
+
+# Can be resolved because of how Dockerfile organizes the code during build
+from config import JSON_LOGGER, CONSOLE_LOG_LEVEL, CONSOLE_LOG_FORMAT_JSON
+
+gunicorn.SERVER_SOFTWARE = "Python"
+
+if JSON_LOGGER:
+    logconfig_dict = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "root": {"level": CONSOLE_LOG_LEVEL, "handlers": []},
+        "loggers": {
+            "gunicorn.error": {
+                "level": CONSOLE_LOG_LEVEL,
+                "handlers": ["error_console"],
+                "propagate": True,
+                "qualname": "gunicorn.error",
+            },
+            "gunicorn.access": {
+                "level": CONSOLE_LOG_LEVEL,
+                "handlers": ["console"],
+                "propagate": True,
+                "qualname": "gunicorn.access",
+            },
+        },
+        "handlers": {
+            "console": {
+                "class": "logging.StreamHandler",
+                "formatter": "json",
+                "stream": "ext://sys.stdout",
+            },
+            "error_console": {
+                "class": "logging.StreamHandler",
+                "formatter": "json",
+                "stream": "ext://sys.stderr",
+            },
+        },
+        "formatters": {
+            "json": {
+                "class": "jsonformatter.JsonFormatter",
+                "format": CONSOLE_LOG_FORMAT_JSON,
+            },
+        },
+    }

pkg/docker/gunicorn_config.py

@@ -242,7 +242,6 @@ _copy_code() {
 
     # License files
     cp "${SOURCEDIR}/LICENSE" "${SERVERROOT}/usr/${APP_NAME}/"
-    cp "${SOURCEDIR}/DEPENDENCIES" "${SERVERROOT}/usr/${APP_NAME}/"
 
     # Web setup script
     mkdir -p "${WEBROOT}/usr/${APP_NAME}/bin/"

pkg/linux/build-functions.sh

@@ -317,7 +317,6 @@ _complete_bundle() {
 
     # License files
     cp -r "${SOURCE_DIR}/LICENSE" "${BUNDLE_DIR}/Contents/"
-    cp -r "${SOURCE_DIR}/DEPENDENCIES" "${BUNDLE_DIR}/Contents/"
 
     # Remove the .pyc files if any
     find "${BUNDLE_DIR}" -name "*.pyc" -print0 | xargs -0 rm -f