Include LICENSE and DEPENDENCIES [inventory] files in official packages. Fixes #5577

Whilst passing, rename libraries.txt to DEPENDENCIES and update the list of static packages.

DEPENDENCIES

@@ -3,7 +3,7 @@ pgAdmin 4 Dependency Inventory
 
 pgAdmin 4 is built on C++, Python and Javascript, and is dependent on various
 third party libraries. These are automatically compiled from the system,
-requirements.txt.and packages.json and list below.
+requirements.txt.and packages.json and listed below.
 
 C++ Dependencies
 ================
@@ -11,9 +11,10 @@ C++ Dependencies
 Name                                                             Version          Licence                              URL
 ----                                                             -------          -------                              ---
 QT                                                               5+               LGPL v2.1/3                          https://www.qt.io/
+QDarkStyleSheet                                                  2.8.1            MIT (code), CC BY 4.0 (images)       https://github.com/ColinDuquesnoy/QDarkStyleSheet
 Python                                                           3.4+             PSF                                  https://www.python.org/
 
-2 dependencies listed.
+3 dependencies listed.
 
 Python Dependencies
 ===================
@@ -34,16 +35,16 @@ Flask-Compress                                                   1.4.0
 passlib                                                          1.7.2            BSD                                  https://bitbucket.org/ecollins/passlib
 pytz                                                             2018.9           MIT                                  http://pythonhosted.org/pytz
 simplejson                                                       3.16.0           MIT License                          https://github.com/simplejson/simplejson
-six                                                              1.14.0           MIT                                  https://github.com/benjaminp/six
+six                                                              1.15.0           MIT                                  https://github.com/benjaminp/six
 speaklater                                                       1.3              UNKNOWN                              http://github.com/mitsuhiko/speaklater
 sqlparse                                                         0.2.4            BSD                                  https://github.com/andialbrecht/sqlparse
 WTForms                                                          2.2.1            BSD                                  https://wtforms.readthedocs.io/
 Flask-Paranoid                                                   0.2.0            MIT                                  http://github.com/miguelgrinberg/flask-paranoid/
 psutil                                                           5.7.0            BSD                                  https://github.com/giampaolo/psutil
-psycopg2                                                         2.8.4            LGPL with exceptions or ZPL          http://initd.org/psycopg/
+psycopg2                                                         2.8.5            LGPL with exceptions                 https://psycopg.org/
 python-dateutil                                                  2.8.1            Dual License                         https://dateutil.readthedocs.io
-SQLAlchemy                                                       1.3.15           MIT                                  http://www.sqlalchemy.org
+SQLAlchemy                                                       1.3.17           MIT                                  http://www.sqlalchemy.org
-Flask-Security-Too                                               3.4.0            MIT                                  https://github.com/jwag956/flask-security
+Flask-Security-Too                                               3.4.3            MIT                                  https://github.com/Flask-Middleware/flask-security
 sshtunnel                                                        0.1.5            MIT                                  https://github.com/pahaz/sshtunnel
 ldap3                                                            2.7              LGPL v3                              https://github.com/cannatag/ldap3
 

Dockerfile

@@ -146,6 +146,10 @@ COPY --from=app-builder /pgadmin4/web /pgadmin4
 COPY --from=docs-builder /pgadmin4/docs/en_US/_build/html/ /pgadmin4/docs
 COPY requirements.txt /pgadmin4/requirements.txt
 
+# License files
+COPY LICENSE /pgadmin4/LICENSE
+COPY DEPENDENCIES /pgadmin4/DEPENDENCIES
+
 # Install build-dependencies, build & install C extensions and purge deps in
 # one RUN step
 RUN apk add --no-cache --virtual \

Make.bat

@@ -219,6 +219,10 @@ REM Main build sequence Ends
     DEL /q "%BUILDROOT%\web\pgadmin4.db" 1> nul 2>&1
     DEL /q "%BUILDROOT%\web\config_local.py" 1> nul 2>&1
 
+    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"
     ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%BUILDROOT%\web\config_distro.py"

docs/en_US/release_notes_4_24.rst

@@ -37,6 +37,7 @@ Bug fixes
 | `Issue #5530 <https://redmine.postgresql.org/issues/5530>`_ -  Ensure that the referenced table should be displayed on foreign key constraints.
 | `Issue #5554 <https://redmine.postgresql.org/issues/5554>`_ -  Replace the runtime themes with ones that don't have sizing issues.
 | `Issue #5569 <https://redmine.postgresql.org/issues/5569>`_ -  Fixed reverse engineered SQL for partitions when storage parameters are specified.
+| `Issue #5577 <https://redmine.postgresql.org/issues/5577>`_ -  Include LICENSE and DEPENDENCIES [inventory] files in official packages.
 | `Issue #5621 <https://redmine.postgresql.org/issues/5621>`_ -  Remove extra brackets from reverse engineering SQL of RLS Policy.
 | `Issue #5629 <https://redmine.postgresql.org/issues/5629>`_ -  Fixed an issue where the user is able to edit properties when some of the collection nodes are selected.
 | `Issue #5630 <https://redmine.postgresql.org/issues/5630>`_ -  Fixed an issue where installation of pgadmin4 not working on 32-bit Windows.

pkg/linux/build-functions.sh

@@ -158,6 +158,10 @@ _copy_code() {
     find . -name "feature_tests" -type d -print0 | xargs -0 rm -rf
     find . -name "__pycache__" -type d -print0 | xargs -0 rm -rf
 
+    # 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/"
     cp "${SOURCEDIR}/pkg/linux/setup-web.sh" "${WEBROOT}/usr/${APP_NAME}/bin/"

pkg/mac/build-functions.sh

@@ -218,6 +218,10 @@ EOF
     echo "    'ppas': ''" >> config_distro.py
     echo "}" >> config_distro.py
 
+    # License files
+    cp -r ${SOURCE_DIR}/LICENCE "${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
 }

pkg/pip/build.sh

@@ -83,7 +83,7 @@ do
 done
 
 cd ../
-for FILE in LICENSE README libraries.txt
+for FILE in LICENSE DEPENDENCIES README
 do
     echo Adding ${FILE}
     # We use tar here to preserve the path, as Mac (for example) doesn't support cp --parents

tools/dependency_inventory.py

@@ -9,7 +9,7 @@
 #
 ##########################################################################
 
-# This utility will generate a iist of all dependencies, their upstream
+# This utility will generate a list of all dependencies, their upstream
 # repos and licence information.
 
 import os
@@ -181,7 +181,7 @@ def dump_header():
         "pgAdmin 4 is built on C++, Python and Javascript, and is "
         "dependent on various third party libraries. These are "
         "automatically compiled from the system, requirements.txt."
-        "and packages.json and list below.",
+        "and packages.json and listed below.",
         width=79) + "\n")
 
 
@@ -189,8 +189,9 @@ def dump_cplusplus():
     print_title("C++ Dependencies")
     print_table_header()
     print_row("QT", "5+", "LGPL v2.1/3", "https://www.qt.io/")
+    print_row("QDarkStyleSheet", "2.8.1", "MIT (code), CC BY 4.0 (images)", "https://github.com/ColinDuquesnoy/QDarkStyleSheet")
     print_row("Python", "3.4+", "PSF", "https://www.python.org/")
-    print_summary(2)
+    print_summary(3)
 
 
 def dump_python():