From 2906e0c52ceade486416e0ed490c31241dd2a033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 22 Jan 2023 15:16:15 +0100 Subject: [PATCH 01/21] Remove buster support and add bookworm support --- conf/{armv7_buster.src => armv7_bookworm.src} | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename conf/{armv7_buster.src => armv7_bookworm.src} (86%) diff --git a/conf/armv7_buster.src b/conf/armv7_bookworm.src similarity index 86% rename from conf/armv7_buster.src rename to conf/armv7_bookworm.src index 7df687f..b0089b1 100644 --- a/conf/armv7_buster.src +++ b/conf/armv7_bookworm.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.18/pgadmin_4-6.18-buster-bin1_armv7l.tar.gz +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.18/pgadmin_4-6.18-bookworm-bin1_armv7l.tar.gz SOURCE_SUM=a1ed682818fa89789ac374fa233e42b745bc4ab6c1f144ea6b0a5b855c287252 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 diff --git a/manifest.json b/manifest.json index af55c8c..cbe1c72 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "email": "josue@tille.ch" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.11" }, "multi_instance": false, "services": [ From 6143e20c533dcf7fb74eee8092a4ce5a4c26d0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 22 Jan 2023 15:25:02 +0100 Subject: [PATCH 02/21] Upgrade pgadmin to 6.19 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- manifest.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index b0089b1..12be6ee 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.18/pgadmin_4-6.18-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=a1ed682818fa89789ac374fa233e42b745bc4ab6c1f144ea6b0a5b855c287252 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.19/pgadmin_4-6.19-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=74b8c975b441f6afc9068063df9e24d2c5adb3625353d4e84c317979de3d045d # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index a43d026..6949857 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.18/pgadmin_4-6.18-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=982f0b15d3e723a10e2ddbebf0ab02f65b1ff813725c049ce8c6d23fb1049994 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.19/pgadmin_4-6.19-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=3685a8db6be03fe2f626b3d3336f0d7fe80c790f1d2477c22cc03891ea06d0b8 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index cbe1c72..472da6f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage PostgreSQL databases over the web", "fr": "Application web de gestion des bases de données PostgreSQL" }, - "version": "6.18~ynh1", + "version": "6.19~ynh1", "url": "https://www.pgadmin.org", "upstream": { "license": "PostgreSQL", From 60432a9115e8adb73d5eebbbda4163b5cd19b629 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 22 Jan 2023 15:25:06 +0000 Subject: [PATCH 03/21] Auto-update README --- README.md | 4 ++-- README_fr.md | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1e117f3..ca5ccf4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # pgAdmin4 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) [![Install pgAdmin4 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) *[Lire ce readme en français.](./README_fr.md)* @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Shipped version:** 6.18~ynh1 +**Shipped version:** 6.19~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c74db5c..f001670 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,24 +5,24 @@ It shall NOT be edited by hand. # pgAdmin4 pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) [![Installer pgAdmin4 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer pgAdmin4 rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer pgAdmin4 rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Version incluse :** 6.18~ynh1 +**Version incluse :** 6.19~ynh1 -## Captures d'écran +## Captures d’écran -![Capture d'écran de pgAdmin4](./doc/screenshots/pgadmin4-welcome-light.png) +![Capture d’écran de pgAdmin4](./doc/screenshots/pgadmin4-welcome-light.png) ## Avertissements / informations importantes @@ -32,8 +32,8 @@ This app actually don't support the SSO and don't support LDAP. After the instal ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : +* Site officiel de l’app : +* Documentation officielle de l’admin : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -49,4 +49,4 @@ ou sudo yunohost app upgrade pgadmin -u https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From ca088137762b8ede80d99910421325bfbebd61cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Feb 2023 08:55:15 +0100 Subject: [PATCH 04/21] Silence warnings --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index aaad63c..0f7016b 100644 --- a/scripts/install +++ b/scripts/install @@ -75,7 +75,7 @@ ynh_app_setting_set --app=$app --key=db_pwd --value="$db_pwd" #================================================= ynh_script_progression --message="Installing dependencies..." --weight=7 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER diff --git a/scripts/restore b/scripts/restore index 7f494d0..8891245 100644 --- a/scripts/restore +++ b/scripts/restore @@ -72,7 +72,7 @@ ynh_restore_file --origin_path="$final_path" ynh_script_progression --message="Reinstalling dependencies..." --weight=5 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies # Check that the good python version is installed # If not upgrade the source diff --git a/scripts/upgrade b/scripts/upgrade index 7c74faa..01a55da 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,7 +81,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # SPECIFIC UPGRADE From f6b36e01906700bfee9e261b39d3e950a023630e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 9 Feb 2023 19:44:30 +0100 Subject: [PATCH 05/21] Cleanup install and use requirement from package build --- scripts/_common.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ef18cc0..2599ab5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -59,9 +59,12 @@ install_source() { source $final_path/bin/activate set -$u_arg; pip3 install --upgrade pip - pip3 install --upgrade 'Werkzeug<1.0' - pip3 install --upgrade 'markupsafe==2.0.1' - pip3 install --upgrade pgadmin4==$app_sub_version + + temp_requirement=$(mktemp) + cp $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt $temp_requirement + chown $pgadmin_user:root $temp_requirement + + sudo -u $pgadmin_user env PATH=$PATH pip3 install --upgrade -r $temp_requirement set +$u_arg; deactivate set -$u_arg; From 1a5393ff5e48af981ef552dac1f4076825b52856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 16 Feb 2023 23:33:14 +0100 Subject: [PATCH 06/21] Upgrade pgadmin to 6.20 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- manifest.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 12be6ee..0e1639b 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.19/pgadmin_4-6.19-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=74b8c975b441f6afc9068063df9e24d2c5adb3625353d4e84c317979de3d045d +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.20/pgadmin_4-6.20-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=834162a17c7fd9f001d774635f23101e598c8da367b3fa32640fb3ccae0230b9 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 6949857..31d62b1 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.19/pgadmin_4-6.19-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=3685a8db6be03fe2f626b3d3336f0d7fe80c790f1d2477c22cc03891ea06d0b8 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.20/pgadmin_4-6.20-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=f297edfb4f77ae1d13eb67be5013f31309b21b61526329093e12981ccc837069 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 472da6f..00f16e0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage PostgreSQL databases over the web", "fr": "Application web de gestion des bases de données PostgreSQL" }, - "version": "6.19~ynh1", + "version": "6.20~ynh1", "url": "https://www.pgadmin.org", "upstream": { "license": "PostgreSQL", From 638b67cab8e0639e8529202b99a30c439955fad7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Feb 2023 07:12:51 +0000 Subject: [PATCH 07/21] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca5ccf4..5d00c24 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # pgAdmin4 for YunoHost [![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) + [![Install pgAdmin4 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) *[Lire ce readme en français.](./README_fr.md)* @@ -18,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Shipped version:** 6.19~ynh1 +**Shipped version:** 6.20~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index f001670..0285d8a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # pgAdmin4 pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) + [![Installer pgAdmin4 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) *[Read this readme in english.](./README.md)* @@ -18,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Version incluse :** 6.19~ynh1 +**Version incluse :** 6.20~ynh1 ## Captures d’écran From 1f7d09e20389db55785378e5573c7f5ae7c0d795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 17 Feb 2023 13:37:44 +0100 Subject: [PATCH 08/21] Add missing requirement --- conf/requirement_bookworm.txt | 84 +++++++++++++++++++++++++++++++++ conf/requirement_bullseye.txt | 87 +++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 conf/requirement_bookworm.txt create mode 100644 conf/requirement_bullseye.txt diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt new file mode 100644 index 0000000..bfa2970 --- /dev/null +++ b/conf/requirement_bookworm.txt @@ -0,0 +1,84 @@ +alembic==1.9.4 +Authlib==1.1.0 +azure-common==1.1.28 +azure-core==1.26.3 +azure-identity==1.9.0 +azure-mgmt-core==1.3.2 +azure-mgmt-rdbms==10.1.0 +azure-mgmt-resource==21.0.0 +azure-mgmt-subscription==3.0.0 +Babel==2.11.0 +bcrypt==3.2.2 +bidict==0.22.1 +blinker==1.5 +boto3==1.26.73 +botocore==1.29.73 +Brotli==1.0.9 +certifi==2022.12.7 +cffi==1.15.1 +chardet==4.0.0 +click==8.1.3 +cryptography==3.4.8 +dnspython==2.2.1 +email-validator==1.3.1 +eventlet==0.33.0 +Flask==2.1.3 +Flask-Babel==2.0.0 +Flask-Compress==1.13 +Flask-Gravatar==0.5.0 +Flask-Login==0.6.2 +Flask-Mail==0.9.1 +Flask-Migrate==4.0.4 +Flask-Paranoid==0.3.0 +Flask-Principal==0.4.0 +Flask-Security-Too==4.1.5 +Flask-SocketIO==5.2.0 +Flask-SQLAlchemy==2.5.1 +Flask-WTF==1.0.1 +greenlet==2.0.2 +httpagentparser==1.9.5 +idna==2.10 +isodate==0.6.1 +itsdangerous==2.1.2 +Jinja2==3.1.2 +jmespath==1.0.1 +ldap3==2.9.1 +Mako==1.2.4 +MarkupSafe==2.1.2 +msal==1.21.0 +msal-extensions==0.3.1 +msrest==0.7.1 +oauthlib==3.2.2 +paramiko==3.0.0 +passlib==1.7.4 +pgadmin4==6.20 +Pillow==9.4.0 +portalocker==2.7.0 +psutil==5.9.3 +psycopg2-binary==2.9.5 +pyasn1==0.4.8 +pycparser==2.21 +PyJWT==2.6.0 +PyNaCl==1.5.0 +pyotp==2.8.0 +pypng==0.20220715.0 +python-dateutil==2.8.2 +python-engineio==4.3.4 +python-socketio==5.7.2 +pytz==2021.3 +qrcode==7.4.2 +requests==2.25.1 +requests-oauthlib==1.3.1 +s3transfer==0.6.0 +simplejson==3.18.3 +six==1.16.0 +speaklater3==1.4 +SQLAlchemy==1.4.46 +sqlparse==0.4.3 +sshtunnel==0.4.0 +typing_extensions==4.5.0 +ua-parser==0.16.1 +urllib3==1.26.14 +user-agents==2.2.0 +Werkzeug==2.1.2 +WTForms==3.0.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt new file mode 100644 index 0000000..3fa734d --- /dev/null +++ b/conf/requirement_bullseye.txt @@ -0,0 +1,87 @@ +alembic==1.9.4 +Authlib==1.1.0 +azure-common==1.1.28 +azure-core==1.26.3 +azure-identity==1.9.0 +azure-mgmt-core==1.3.2 +azure-mgmt-rdbms==10.1.0 +azure-mgmt-resource==21.0.0 +azure-mgmt-subscription==3.0.0 +Babel==2.11.0 +bcrypt==3.2.2 +bidict==0.22.1 +blinker==1.5 +boto3==1.26.73 +botocore==1.29.73 +Brotli==1.0.9 +certifi==2022.12.7 +cffi==1.15.1 +chardet==4.0.0 +click==8.1.3 +cryptography==3.4.8 +dnspython==2.2.1 +email-validator==1.3.1 +eventlet==0.33.0 +Flask==2.1.3 +Flask-Babel==2.0.0 +Flask-Compress==1.13 +Flask-Gravatar==0.5.0 +Flask-Login==0.6.2 +Flask-Mail==0.9.1 +Flask-Migrate==4.0.4 +Flask-Paranoid==0.3.0 +Flask-Principal==0.4.0 +Flask-Security-Too==4.1.5 +Flask-SocketIO==5.2.0 +Flask-SQLAlchemy==2.5.1 +Flask-WTF==1.0.1 +greenlet==1.1.2 +httpagentparser==1.9.5 +idna==2.10 +importlib-metadata==6.0.0 +isodate==0.6.1 +itsdangerous==2.1.2 +Jinja2==3.1.2 +jmespath==1.0.1 +ldap3==2.9.1 +Mako==1.2.4 +MarkupSafe==2.1.2 +msal==1.21.0 +msal-extensions==0.3.1 +msrest==0.7.1 +oauthlib==3.2.2 +paramiko==3.0.0 +passlib==1.7.4 +pgadmin4==6.20 +Pillow==9.4.0 +pkg_resources==0.0.0 +portalocker==2.7.0 +psutil==5.9.3 +psycopg2-binary==2.9.5 +pyasn1==0.4.8 +pycparser==2.21 +PyJWT==2.6.0 +PyNaCl==1.5.0 +pyotp==2.8.0 +pypng==0.20220715.0 +python-dateutil==2.8.2 +python-engineio==4.3.4 +python-socketio==5.7.2 +pytz==2021.3 +qrcode==7.4.2 +requests==2.25.1 +requests-oauthlib==1.3.1 +s3transfer==0.6.0 +simplejson==3.18.3 +six==1.16.0 +speaklater3==1.4 +SQLAlchemy==1.4.46 +sqlparse==0.4.3 +sshtunnel==0.4.0 +typing_extensions==4.5.0 +ua-parser==0.16.1 +urllib3==1.26.14 +user-agents==2.2.0 +Werkzeug==2.1.2 +WTForms==3.0.1 +zipp==3.13.0 From fe4323a21d7dc8d70b302c36040797548b70512f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 17 Feb 2023 19:40:51 +0100 Subject: [PATCH 09/21] Fix permissions --- scripts/_common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2599ab5..4d42d86 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -63,6 +63,7 @@ install_source() { temp_requirement=$(mktemp) cp $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt $temp_requirement chown $pgadmin_user:root $temp_requirement + chown $pgadmin_user:root -R $final_path sudo -u $pgadmin_user env PATH=$PATH pip3 install --upgrade -r $temp_requirement set +$u_arg; From 4183f1a7e49fe33774ebf38c393ad4c857af2a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 17 Feb 2023 21:58:04 +0100 Subject: [PATCH 10/21] Fix issue with removed table collum --- scripts/config_database.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/config_database.py b/scripts/config_database.py index 7b60626..5f1ce78 100644 --- a/scripts/config_database.py +++ b/scripts/config_database.py @@ -23,17 +23,17 @@ crypted_password = crypto.encrypt(password, user_encrypted_password) # Declare database data to put in database data = {'id': 1,'user_id': 1, 'servergroup_id' : 1, 'name': 'Yunohost Server', 'host': 'localhost', 'port': 5432,'maintenance_db':'postgres','username':username, - 'ssl_mode':'prefer', 'comment' : '', 'password' :crypted_password,'role':'', 'discovery_id':'', 'hostaddr':'','db_res':'','passfile':'', + 'comment' : '', 'password' :crypted_password,'role':'', 'discovery_id':'', 'hostaddr':'','db_res':'','passfile':'', 'sslcert' :'','sslkey':'','sslrootcert':'','sslcrl':''} # Insert new data in database cursor = conn.cursor() cursor.execute('''INSERT INTO `server`( `id`,`user_id`,`servergroup_id`,`name`,`host`,`port`,`maintenance_db`,`username`, - `ssl_mode`,`comment`,`password`,`role`,`discovery_id`,`hostaddr`,`db_res`,`passfile`,`sslcert`,`sslkey`,`sslrootcert`,`sslcrl` + `comment`,`password`,`role`,`discovery_id`,`hostaddr`,`db_res`,`passfile`,`sslcert`,`sslkey`,`sslrootcert`,`sslcrl` ) VALUES( :id,:user_id,:servergroup_id,:name,:host,:port,:maintenance_db,:username, - :ssl_mode,:comment,:password,:role,:discovery_id,:hostaddr,:db_res,:passfile,:sslcert,:sslkey,:sslrootcert,:sslcrl + :comment,:password,:role,:discovery_id,:hostaddr,:db_res,:passfile,:sslcert,:sslkey,:sslrootcert,:sslcrl )''', data) conn.commit() From 590545fb5421f800080e23a97c02861c7beede57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 20 Feb 2023 08:22:24 +0100 Subject: [PATCH 11/21] Rewrite sql script with last pgadmin version --- scripts/_common.sh | 2 +- scripts/config_database.py | 38 ++++++++++++++++++++++++++------------ scripts/install | 1 - 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4d42d86..1357ded 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -58,7 +58,7 @@ install_source() { set +$u_arg; source $final_path/bin/activate set -$u_arg; - pip3 install --upgrade pip + pip3 install --upgrade pip wheel temp_requirement=$(mktemp) cp $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt $temp_requirement diff --git a/scripts/config_database.py b/scripts/config_database.py index 5f1ce78..7a1db20 100644 --- a/scripts/config_database.py +++ b/scripts/config_database.py @@ -1,11 +1,13 @@ #!/usr/bin/python -import imp +from importlib.machinery import SourceFileLoader import sqlite3 import sys -# Import crypto from pgadmin project -crypto = imp.load_source('crypt', '/opt/yunohost/pgadmin/lib/python__PYTHON_VERSION__/site-packages/pgadmin4/pgadmin/utils/crypto.py') +# Import crypto from pgadmin project __PYTHON_VERSION__ +python_version = str(sys.version_info[0]) + "." + str(sys.version_info[1]) +crypto = SourceFileLoader('crypto', '/opt/yunohost/pgadmin/lib/python' + + python_version + '/site-packages/pgadmin4/pgadmin/utils/crypto.py').load_module() # Get arguments username = sys.argv[1] @@ -22,18 +24,30 @@ user_encrypted_password = cursor.fetchone()[0] crypted_password = crypto.encrypt(password, user_encrypted_password) # Declare database data to put in database -data = {'id': 1,'user_id': 1, 'servergroup_id' : 1, 'name': 'Yunohost Server', 'host': 'localhost', 'port': 5432,'maintenance_db':'postgres','username':username, - 'comment' : '', 'password' :crypted_password,'role':'', 'discovery_id':'', 'hostaddr':'','db_res':'','passfile':'', - 'sslcert' :'','sslkey':'','sslrootcert':'','sslcrl':''} +data = {'id': 1, 'user_id': 1, 'servergroup_id': 1, 'name': 'Yunohost Server', 'host': 'localhost', 'port': 5432, 'maintenance_db': 'postgres', + 'username': username, 'comment': '', 'password': crypted_password, 'role': '', 'discovery_id': '', + 'db_res': '', 'bgcolor': '', 'fgcolor': '', 'service': '', + 'use_ssh_tunnel': '', 'tunnel_host': '', 'tunnel_port': 22, 'tunnel_username': '', 'tunnel_authentication': '', 'tunnel_identity_file': '', 'tunnel_password': '', + 'save_password': 1, 'shared': '', 'kerberos_conn': 0, 'cloud_status': 0, 'passexec_cmd': '', 'passexec_expiration': '', + 'connection_params': '''{"sslmode": "prefer", "connect_timeout": 10, "sslcert": "/.postgresql/postgresql.crt", "sslkey": "/.postgresql/postgresql.key"}'''} # Insert new data in database cursor = conn.cursor() -cursor.execute('''INSERT INTO `server`( - `id`,`user_id`,`servergroup_id`,`name`,`host`,`port`,`maintenance_db`,`username`, - `comment`,`password`,`role`,`discovery_id`,`hostaddr`,`db_res`,`passfile`,`sslcert`,`sslkey`,`sslrootcert`,`sslcrl` - ) VALUES( - :id,:user_id,:servergroup_id,:name,:host,:port,:maintenance_db,:username, - :comment,:password,:role,:discovery_id,:hostaddr,:db_res,:passfile,:sslcert,:sslkey,:sslrootcert,:sslcrl +cursor.execute(''' + `server` ( + `id`,`user_id`,`servergroup_id`,`name`,`host`,`port`,`maintenance_db`, + `username`,`comment`,`password`,`role`,`discovery_id`, + `db_res`,`bgcolor`,`fgcolor`,`service`, + `use_ssh_tunnel`,`tunnel_host`,`tunnel_port`,`tunnel_username`,`tunnel_authentication`,`tunnel_identity_file`,`tunnel_password`, + `save_password`,`shared`,`kerberos_conn`,`cloud_status`,`passexec_cmd`,`passexec_expiration`, + `connection_params` + ) VALUES ( + :id,:user_id,:servergroup_id,:name,:host,:port,:maintenance_db, + :username,:comment,:password,:role,:discovery_id, + :db_res,:bgcolor,:fgcolor,:service, + :use_ssh_tunnel,:tunnel_host,:tunnel_port,:tunnel_username,:tunnel_authentication,:tunnel_identity_file,:tunnel_password, + :save_password,:shared,:kerberos_conn,:cloud_status,:passexec_cmd,:passexec_expiration, + :connection_params )''', data) conn.commit() diff --git a/scripts/install b/scripts/install index 0f7016b..ba612ea 100644 --- a/scripts/install +++ b/scripts/install @@ -135,7 +135,6 @@ ynh_psql_execute_as_root \ --sql "CREATE USER ${db_user} WITH PASSWORD '${db_pwd}' SUPERUSER CREATEDB CREATEROLE REPLICATION" # Add Server In PGadmin database -ynh_replace_string --match_string "__PYTHON_VERSION__" --replace_string "$python_version" --target_file config_database.py $final_path/bin/python3 config_database.py "$db_user" "$db_pwd" set +u; deactivate From 890979d09a2b72962111a644e961409e96092b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 10 Mar 2023 07:58:06 +0100 Subject: [PATCH 12/21] Cleanup rust install for pip --- scripts/_common.sh | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1357ded..4e1f1e3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -41,15 +41,6 @@ install_source() { ynh_secure_remove --file=$final_path/share ynh_setup_source --dest_dir $final_path/ --source_id "armv7_$(lsb_release --codename --short)" else - # Install rustup is not already installed - # We need this to be able to install cryptgraphy - export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin" - if [ -e $final_path/.rustup ]; then - sudo -u "$pgadmin_user" env PATH=$PATH rustup update - else - sudo -u "$pgadmin_user" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable --profile=minimal' - fi - # Install virtualenv if it don't exist test -e $final_path/bin/python3 || python3 -m venv $final_path @@ -59,13 +50,7 @@ install_source() { source $final_path/bin/activate set -$u_arg; pip3 install --upgrade pip wheel - - temp_requirement=$(mktemp) - cp $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt $temp_requirement - chown $pgadmin_user:root $temp_requirement - chown $pgadmin_user:root -R $final_path - - sudo -u $pgadmin_user env PATH=$PATH pip3 install --upgrade -r $temp_requirement + pip3 install --upgrade -r $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt set +$u_arg; deactivate set -$u_arg; From 15a9a3034e2dae1ec99ae8996213ae12c57fa81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 10 Mar 2023 07:58:17 +0100 Subject: [PATCH 13/21] fix database config --- scripts/config_database.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config_database.py b/scripts/config_database.py index 7a1db20..d62f48a 100644 --- a/scripts/config_database.py +++ b/scripts/config_database.py @@ -34,7 +34,7 @@ data = {'id': 1, 'user_id': 1, 'servergroup_id': 1, 'name': 'Yunohost Server', ' # Insert new data in database cursor = conn.cursor() cursor.execute(''' - `server` ( + INSERT INTO `server` ( `id`,`user_id`,`servergroup_id`,`name`,`host`,`port`,`maintenance_db`, `username`,`comment`,`password`,`role`,`discovery_id`, `db_res`,`bgcolor`,`fgcolor`,`service`, @@ -48,7 +48,7 @@ cursor.execute(''' :use_ssh_tunnel,:tunnel_host,:tunnel_port,:tunnel_username,:tunnel_authentication,:tunnel_identity_file,:tunnel_password, :save_password,:shared,:kerberos_conn,:cloud_status,:passexec_cmd,:passexec_expiration, :connection_params - )''', data) + );''', data) conn.commit() # Close connection From 2a69790e0321f822e0f481b9814882b6fc7e9212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Thu, 9 Mar 2023 23:40:15 +0100 Subject: [PATCH 14/21] Upgrade pgadmin to 6.21 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 12 ++++++------ conf/requirement_bullseye.txt | 14 +++++++------- manifest.json | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 0e1639b..bb05c30 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.20/pgadmin_4-6.20-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=834162a17c7fd9f001d774635f23101e598c8da367b3fa32640fb3ccae0230b9 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.21/pgadmin_4-6.21-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=fe2bc4974bd5831f6307d6eb2ec099f95ce2de36456aac2a1760fe85bf4a97d7 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 31d62b1..d35f3da 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.20/pgadmin_4-6.20-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=f297edfb4f77ae1d13eb67be5013f31309b21b61526329093e12981ccc837069 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.21/pgadmin_4-6.21-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=919698ca707afc2307acf229ff26113550609495faafed08721e7e69401b8391 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index bfa2970..a84895e 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,4 +1,4 @@ -alembic==1.9.4 +alembic==1.10.2 Authlib==1.1.0 azure-common==1.1.28 azure-core==1.26.3 @@ -7,12 +7,12 @@ azure-mgmt-core==1.3.2 azure-mgmt-rdbms==10.1.0 azure-mgmt-resource==21.0.0 azure-mgmt-subscription==3.0.0 -Babel==2.11.0 +Babel==2.12.1 bcrypt==3.2.2 bidict==0.22.1 blinker==1.5 -boto3==1.26.73 -botocore==1.29.73 +boto3==1.26.88 +botocore==1.29.88 Brotli==1.0.9 certifi==2022.12.7 cffi==1.15.1 @@ -31,7 +31,7 @@ Flask-Mail==0.9.1 Flask-Migrate==4.0.4 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 -Flask-Security-Too==4.1.5 +Flask-Security-Too==4.1.6 Flask-SocketIO==5.2.0 Flask-SQLAlchemy==2.5.1 Flask-WTF==1.0.1 @@ -51,7 +51,7 @@ msrest==0.7.1 oauthlib==3.2.2 paramiko==3.0.0 passlib==1.7.4 -pgadmin4==6.20 +pgadmin4==6.21 Pillow==9.4.0 portalocker==2.7.0 psutil==5.9.3 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 3fa734d..ad1047e 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,4 +1,4 @@ -alembic==1.9.4 +alembic==1.10.2 Authlib==1.1.0 azure-common==1.1.28 azure-core==1.26.3 @@ -7,12 +7,12 @@ azure-mgmt-core==1.3.2 azure-mgmt-rdbms==10.1.0 azure-mgmt-resource==21.0.0 azure-mgmt-subscription==3.0.0 -Babel==2.11.0 +Babel==2.12.1 bcrypt==3.2.2 bidict==0.22.1 blinker==1.5 -boto3==1.26.73 -botocore==1.29.73 +boto3==1.26.88 +botocore==1.29.88 Brotli==1.0.9 certifi==2022.12.7 cffi==1.15.1 @@ -31,7 +31,7 @@ Flask-Mail==0.9.1 Flask-Migrate==4.0.4 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 -Flask-Security-Too==4.1.5 +Flask-Security-Too==4.1.6 Flask-SocketIO==5.2.0 Flask-SQLAlchemy==2.5.1 Flask-WTF==1.0.1 @@ -52,7 +52,7 @@ msrest==0.7.1 oauthlib==3.2.2 paramiko==3.0.0 passlib==1.7.4 -pgadmin4==6.20 +pgadmin4==6.21 Pillow==9.4.0 pkg_resources==0.0.0 portalocker==2.7.0 @@ -84,4 +84,4 @@ urllib3==1.26.14 user-agents==2.2.0 Werkzeug==2.1.2 WTForms==3.0.1 -zipp==3.13.0 +zipp==3.15.0 diff --git a/manifest.json b/manifest.json index 00f16e0..d1699a6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage PostgreSQL databases over the web", "fr": "Application web de gestion des bases de données PostgreSQL" }, - "version": "6.20~ynh1", + "version": "6.21~ynh1", "url": "https://www.pgadmin.org", "upstream": { "license": "PostgreSQL", From 48e271f41a0e3dabea07debf3cff9d551385dc4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 28 Apr 2023 00:18:20 +0200 Subject: [PATCH 15/21] Install psycopg binary for psycopg3 --- scripts/_common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4e1f1e3..ea3c266 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -50,6 +50,7 @@ install_source() { source $final_path/bin/activate set -$u_arg; pip3 install --upgrade pip wheel + pip3 install -I --upgrade "psycopg[c]" pip3 install --upgrade -r $YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt set +$u_arg; deactivate From 3ebe33ff24bf2cbeef5a7d471df7375e7e415185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 6 Jun 2023 00:33:07 +0200 Subject: [PATCH 16/21] Upgrade pgadmin to 7.2 --- conf/armv7_bookworm.src | 4 +- conf/armv7_bullseye.src | 4 +- conf/requirement_bookworm.txt | 110 ++++++++++++++++++++-------------- conf/requirement_bullseye.txt | 110 ++++++++++++++++++++-------------- manifest.json | 2 +- 5 files changed, 134 insertions(+), 96 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index bb05c30..f552579 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.21/pgadmin_4-6.21-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=fe2bc4974bd5831f6307d6eb2ec099f95ce2de36456aac2a1760fe85bf4a97d7 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.2/pgadmin_4-7.2-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=a1f25056dbc496ab280a2bb55f93ed85f2b78f1ec5178bdce22f74c2484125da # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index d35f3da..178140a 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.21/pgadmin_4-6.21-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=919698ca707afc2307acf229ff26113550609495faafed08721e7e69401b8391 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.2/pgadmin_4-7.2-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=7507738e9188ed19a894c1d8b8e89844eecd97b7167823be2cde71506a2e68e1 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index a84895e..61ded95 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,29 +1,30 @@ -alembic==1.10.2 -Authlib==1.1.0 +alembic==1.11.1 +Authlib==1.2.0 azure-common==1.1.28 -azure-core==1.26.3 -azure-identity==1.9.0 -azure-mgmt-core==1.3.2 +azure-core==1.27.0 +azure-identity==1.12.0 +azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 -azure-mgmt-resource==21.0.0 -azure-mgmt-subscription==3.0.0 +azure-mgmt-resource==23.0.0 +azure-mgmt-subscription==3.1.1 Babel==2.12.1 -bcrypt==3.2.2 +bcrypt==4.0.1 bidict==0.22.1 -blinker==1.5 -boto3==1.26.88 -botocore==1.29.88 +blinker==1.6.2 +boto3==1.26.147 +botocore==1.29.147 Brotli==1.0.9 -certifi==2022.12.7 +cachetools==5.3.1 +certifi==2023.5.7 cffi==1.15.1 -chardet==4.0.0 +charset-normalizer==3.1.0 click==8.1.3 -cryptography==3.4.8 -dnspython==2.2.1 -email-validator==1.3.1 -eventlet==0.33.0 -Flask==2.1.3 -Flask-Babel==2.0.0 +cryptography==40.0.2 +dnspython==2.3.0 +email-validator==2.0.0.post2 +eventlet==0.33.3 +Flask==2.2.5 +flask-babel==3.1.0 Flask-Compress==1.13 Flask-Gravatar==0.5.0 Flask-Login==0.6.2 @@ -31,54 +32,73 @@ Flask-Mail==0.9.1 Flask-Migrate==4.0.4 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 -Flask-Security-Too==4.1.6 -Flask-SocketIO==5.2.0 -Flask-SQLAlchemy==2.5.1 -Flask-WTF==1.0.1 +Flask-Security-Too==5.1.2 +Flask-SocketIO==5.3.4 +Flask-SQLAlchemy==3.0.3 +Flask-WTF==1.1.1 +google-api-core==2.11.0 +google-api-python-client==2.88.0 +google-auth==2.19.1 +google-auth-httplib2==0.1.0 +google-auth-oauthlib==1.0.0 +googleapis-common-protos==1.59.0 greenlet==2.0.2 httpagentparser==1.9.5 -idna==2.10 +httplib2==0.22.0 +idna==3.4 +importlib-metadata==6.6.0 isodate==0.6.1 itsdangerous==2.1.2 +jaraco.classes==3.2.3 +jeepney==0.8.0 Jinja2==3.1.2 jmespath==1.0.1 +keyring==23.13.1 ldap3==2.9.1 Mako==1.2.4 -MarkupSafe==2.1.2 -msal==1.21.0 -msal-extensions==0.3.1 +MarkupSafe==2.1.3 +more-itertools==9.1.0 +msal==1.22.0 +msal-extensions==1.0.0 msrest==0.7.1 oauthlib==3.2.2 -paramiko==3.0.0 +paramiko==3.2.0 passlib==1.7.4 -pgadmin4==6.21 -Pillow==9.4.0 +pgadmin4 @ file:///root/pgadmin4-7.2-py3-none-any.whl#sha256=ee17b2b892c3c0eb8e17bd771e3ea642c931a7d5f147f90e2efccb76a3ea0a12 +Pillow==9.5.0 portalocker==2.7.0 -psutil==5.9.3 -psycopg2-binary==2.9.5 -pyasn1==0.4.8 +protobuf==4.23.2 +psutil==5.9.5 +psycopg==3.1.8 +psycopg-c==3.1.8 +pyasn1==0.5.0 +pyasn1-modules==0.3.0 pycparser==2.21 -PyJWT==2.6.0 +PyJWT==2.7.0 PyNaCl==1.5.0 pyotp==2.8.0 +pyparsing==3.0.9 pypng==0.20220715.0 python-dateutil==2.8.2 -python-engineio==4.3.4 -python-socketio==5.7.2 -pytz==2021.3 +python-engineio==4.4.1 +python-socketio==5.8.0 +pytz==2023.3 qrcode==7.4.2 -requests==2.25.1 +requests==2.28.2 requests-oauthlib==1.3.1 -s3transfer==0.6.0 -simplejson==3.18.3 +rsa==4.9 +s3transfer==0.6.1 +SecretStorage==3.3.3 six==1.16.0 speaklater3==1.4 -SQLAlchemy==1.4.46 -sqlparse==0.4.3 +SQLAlchemy==2.0.15 +sqlparse==0.4.4 sshtunnel==0.4.0 -typing_extensions==4.5.0 +typing_extensions==4.6.3 ua-parser==0.16.1 -urllib3==1.26.14 +uritemplate==4.1.1 +urllib3==1.26.16 user-agents==2.2.0 -Werkzeug==2.1.2 +Werkzeug==2.2.3 WTForms==3.0.1 +zipp==3.15.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index ad1047e..7836296 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,29 +1,30 @@ -alembic==1.10.2 -Authlib==1.1.0 +alembic==1.11.1 +Authlib==1.2.0 azure-common==1.1.28 -azure-core==1.26.3 -azure-identity==1.9.0 -azure-mgmt-core==1.3.2 +azure-core==1.27.0 +azure-identity==1.12.0 +azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 -azure-mgmt-resource==21.0.0 -azure-mgmt-subscription==3.0.0 +azure-mgmt-resource==23.0.0 +azure-mgmt-subscription==3.1.1 Babel==2.12.1 -bcrypt==3.2.2 +bcrypt==4.0.1 bidict==0.22.1 -blinker==1.5 -boto3==1.26.88 -botocore==1.29.88 +blinker==1.6.2 +boto3==1.26.147 +botocore==1.29.147 Brotli==1.0.9 -certifi==2022.12.7 +cachetools==5.3.1 +certifi==2023.5.7 cffi==1.15.1 -chardet==4.0.0 +charset-normalizer==3.1.0 click==8.1.3 -cryptography==3.4.8 -dnspython==2.2.1 -email-validator==1.3.1 -eventlet==0.33.0 -Flask==2.1.3 -Flask-Babel==2.0.0 +cryptography==40.0.2 +dnspython==2.3.0 +email-validator==2.0.0.post2 +eventlet==0.33.3 +Flask==2.2.5 +flask-babel==3.1.0 Flask-Compress==1.13 Flask-Gravatar==0.5.0 Flask-Login==0.6.2 @@ -31,57 +32,74 @@ Flask-Mail==0.9.1 Flask-Migrate==4.0.4 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 -Flask-Security-Too==4.1.6 -Flask-SocketIO==5.2.0 -Flask-SQLAlchemy==2.5.1 -Flask-WTF==1.0.1 +Flask-Security-Too==5.1.2 +Flask-SocketIO==5.3.4 +Flask-SQLAlchemy==3.0.3 +Flask-WTF==1.1.1 +google-api-core==2.11.0 +google-api-python-client==2.88.0 +google-auth==2.19.1 +google-auth-httplib2==0.1.0 +google-auth-oauthlib==1.0.0 +googleapis-common-protos==1.59.0 greenlet==1.1.2 httpagentparser==1.9.5 -idna==2.10 -importlib-metadata==6.0.0 +httplib2==0.22.0 +idna==3.4 +importlib-metadata==6.6.0 isodate==0.6.1 itsdangerous==2.1.2 +jaraco.classes==3.2.3 +jeepney==0.8.0 Jinja2==3.1.2 jmespath==1.0.1 +keyring==23.13.1 ldap3==2.9.1 Mako==1.2.4 -MarkupSafe==2.1.2 -msal==1.21.0 -msal-extensions==0.3.1 +MarkupSafe==2.1.3 +more-itertools==9.1.0 +msal==1.22.0 +msal-extensions==1.0.0 msrest==0.7.1 oauthlib==3.2.2 -paramiko==3.0.0 +paramiko==3.2.0 passlib==1.7.4 -pgadmin4==6.21 -Pillow==9.4.0 +pgadmin4 @ file:///home/app_upgrader/pgadmin4-7.2-py3-none-any.whl#sha256=89d97e5c6567ba61dd9949ec1991924fdd773d09f58c557ddd20267830d7e09b +Pillow==9.5.0 pkg_resources==0.0.0 portalocker==2.7.0 -psutil==5.9.3 -psycopg2-binary==2.9.5 -pyasn1==0.4.8 +protobuf==4.23.2 +psutil==5.9.5 +psycopg==3.1.8 +psycopg-c==3.1.8 +pyasn1==0.5.0 +pyasn1-modules==0.3.0 pycparser==2.21 -PyJWT==2.6.0 +PyJWT==2.7.0 PyNaCl==1.5.0 pyotp==2.8.0 +pyparsing==3.0.9 pypng==0.20220715.0 python-dateutil==2.8.2 -python-engineio==4.3.4 -python-socketio==5.7.2 -pytz==2021.3 +python-engineio==4.4.1 +python-socketio==5.8.0 +pytz==2023.3 qrcode==7.4.2 -requests==2.25.1 +requests==2.28.2 requests-oauthlib==1.3.1 -s3transfer==0.6.0 -simplejson==3.18.3 +rsa==4.9 +s3transfer==0.6.1 +SecretStorage==3.3.3 six==1.16.0 speaklater3==1.4 -SQLAlchemy==1.4.46 -sqlparse==0.4.3 +SQLAlchemy==2.0.15 +sqlparse==0.4.4 sshtunnel==0.4.0 -typing_extensions==4.5.0 +typing_extensions==4.6.3 ua-parser==0.16.1 -urllib3==1.26.14 +uritemplate==4.1.1 +urllib3==1.26.16 user-agents==2.2.0 -Werkzeug==2.1.2 +Werkzeug==2.2.3 WTForms==3.0.1 zipp==3.15.0 diff --git a/manifest.json b/manifest.json index d1699a6..69263b5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage PostgreSQL databases over the web", "fr": "Application web de gestion des bases de données PostgreSQL" }, - "version": "6.21~ynh1", + "version": "7.2~ynh1", "url": "https://www.pgadmin.org", "upstream": { "license": "PostgreSQL", From e47f49a79e839bdd90a5354d5dcae0fb9e7b1076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 7 Jun 2023 06:08:24 +0200 Subject: [PATCH 17/21] Upgrade pgadmin to 7.3 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 8 ++++---- conf/requirement_bullseye.txt | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index f552579..66b8d5f 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.2/pgadmin_4-7.2-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=a1f25056dbc496ab280a2bb55f93ed85f2b78f1ec5178bdce22f74c2484125da +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.3/pgadmin_4-7.3-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=fc402d3eac52a5a5d2e90e25d6564c9865e3d80ded3f2220ae7a2264e5958783 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 178140a..3f751a7 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.2/pgadmin_4-7.2-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=7507738e9188ed19a894c1d8b8e89844eecd97b7167823be2cde71506a2e68e1 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.3/pgadmin_4-7.3-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=b4d8e39ef0f64862e51a5f619084892ca9029d9573f0f2ea150cf3cee83486ba # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 61ded95..7830245 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -11,8 +11,8 @@ Babel==2.12.1 bcrypt==4.0.1 bidict==0.22.1 blinker==1.6.2 -boto3==1.26.147 -botocore==1.29.147 +boto3==1.26.148 +botocore==1.29.148 Brotli==1.0.9 cachetools==5.3.1 certifi==2023.5.7 @@ -64,7 +64,7 @@ msrest==0.7.1 oauthlib==3.2.2 paramiko==3.2.0 passlib==1.7.4 -pgadmin4 @ file:///root/pgadmin4-7.2-py3-none-any.whl#sha256=ee17b2b892c3c0eb8e17bd771e3ea642c931a7d5f147f90e2efccb76a3ea0a12 +pgadmin4 @ file:///root/pgadmin4-7.3-py3-none-any.whl#sha256=b1cc252d761d715b3ed39b8af5184bce8dd891aa8c41fcfe5f739c2f056aa7f8 Pillow==9.5.0 portalocker==2.7.0 protobuf==4.23.2 @@ -84,7 +84,7 @@ python-engineio==4.4.1 python-socketio==5.8.0 pytz==2023.3 qrcode==7.4.2 -requests==2.28.2 +requests==2.31.0 requests-oauthlib==1.3.1 rsa==4.9 s3transfer==0.6.1 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 7836296..089d6d4 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -11,8 +11,8 @@ Babel==2.12.1 bcrypt==4.0.1 bidict==0.22.1 blinker==1.6.2 -boto3==1.26.147 -botocore==1.29.147 +boto3==1.26.148 +botocore==1.29.148 Brotli==1.0.9 cachetools==5.3.1 certifi==2023.5.7 @@ -64,7 +64,7 @@ msrest==0.7.1 oauthlib==3.2.2 paramiko==3.2.0 passlib==1.7.4 -pgadmin4 @ file:///home/app_upgrader/pgadmin4-7.2-py3-none-any.whl#sha256=89d97e5c6567ba61dd9949ec1991924fdd773d09f58c557ddd20267830d7e09b +pgadmin4 @ file:///home/app_upgrader/pgadmin4-7.3-py3-none-any.whl#sha256=972457d668607ca09ec1a408e38fb3b312dabff76814b004cfffa352276e53bb Pillow==9.5.0 pkg_resources==0.0.0 portalocker==2.7.0 @@ -85,7 +85,7 @@ python-engineio==4.4.1 python-socketio==5.8.0 pytz==2023.3 qrcode==7.4.2 -requests==2.28.2 +requests==2.31.0 requests-oauthlib==1.3.1 rsa==4.9 s3transfer==0.6.1 From ad772bea64ac8cae6b48682e5eea28468a4d58aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 30 Jun 2023 00:14:30 +0200 Subject: [PATCH 18/21] Upgrade pgadmin to 7.4 --- conf/armv7_bookworm.src | 4 ++-- conf/armv7_bullseye.src | 4 ++-- conf/requirement_bookworm.txt | 34 +++++++++++++++++----------------- conf/requirement_bullseye.txt | 34 +++++++++++++++++----------------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 66b8d5f..983640e 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.3/pgadmin_4-7.3-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=fc402d3eac52a5a5d2e90e25d6564c9865e3d80ded3f2220ae7a2264e5958783 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.4/pgadmin_4-7.4-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=3e07e653ddbd0e4e7faaa08a7266a65eb4e28017aceb1719bb71a17dca8a9cb1 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index 3f751a7..b6627c3 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.3/pgadmin_4-7.3-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=b4d8e39ef0f64862e51a5f619084892ca9029d9573f0f2ea150cf3cee83486ba +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.4/pgadmin_4-7.4-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=8f1310bd97b68ff9dca6909b0ddc765e004f183baef4451a273c5a74230530cb # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 7830245..e083b7d 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,18 +1,18 @@ alembic==1.11.1 -Authlib==1.2.0 +Authlib==1.2.1 azure-common==1.1.28 -azure-core==1.27.0 -azure-identity==1.12.0 +azure-core==1.27.1 +azure-identity==1.13.0 azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 -azure-mgmt-resource==23.0.0 +azure-mgmt-resource==23.0.1 azure-mgmt-subscription==3.1.1 Babel==2.12.1 bcrypt==4.0.1 bidict==0.22.1 blinker==1.6.2 -boto3==1.26.148 -botocore==1.29.148 +boto3==1.26.164 +botocore==1.29.164 Brotli==1.0.9 cachetools==5.3.1 certifi==2023.5.7 @@ -34,19 +34,19 @@ Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 Flask-Security-Too==5.1.2 Flask-SocketIO==5.3.4 -Flask-SQLAlchemy==3.0.3 +Flask-SQLAlchemy==3.0.5 Flask-WTF==1.1.1 -google-api-core==2.11.0 -google-api-python-client==2.88.0 -google-auth==2.19.1 +google-api-core==2.11.1 +google-api-python-client==2.91.0 +google-auth==2.21.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==1.0.0 -googleapis-common-protos==1.59.0 +googleapis-common-protos==1.59.1 greenlet==2.0.2 httpagentparser==1.9.5 httplib2==0.22.0 idna==3.4 -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 isodate==0.6.1 itsdangerous==2.1.2 jaraco.classes==3.2.3 @@ -64,10 +64,10 @@ msrest==0.7.1 oauthlib==3.2.2 paramiko==3.2.0 passlib==1.7.4 -pgadmin4 @ file:///root/pgadmin4-7.3-py3-none-any.whl#sha256=b1cc252d761d715b3ed39b8af5184bce8dd891aa8c41fcfe5f739c2f056aa7f8 +pgadmin4 @ file:///root/pgadmin4-7.4-py3-none-any.whl#sha256=c92876a5f44e45cf83c0790adcb99dca1d7fad4780ea34ef3013cb13f9331f6a Pillow==9.5.0 portalocker==2.7.0 -protobuf==4.23.2 +protobuf==4.23.3 psutil==5.9.5 psycopg==3.1.8 psycopg-c==3.1.8 @@ -77,7 +77,7 @@ pycparser==2.21 PyJWT==2.7.0 PyNaCl==1.5.0 pyotp==2.8.0 -pyparsing==3.0.9 +pyparsing==3.1.0 pypng==0.20220715.0 python-dateutil==2.8.2 python-engineio==4.4.1 @@ -91,10 +91,10 @@ s3transfer==0.6.1 SecretStorage==3.3.3 six==1.16.0 speaklater3==1.4 -SQLAlchemy==2.0.15 +SQLAlchemy==2.0.17 sqlparse==0.4.4 sshtunnel==0.4.0 -typing_extensions==4.6.3 +typing_extensions==4.7.0 ua-parser==0.16.1 uritemplate==4.1.1 urllib3==1.26.16 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 089d6d4..87d240e 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,18 +1,18 @@ alembic==1.11.1 -Authlib==1.2.0 +Authlib==1.2.1 azure-common==1.1.28 -azure-core==1.27.0 -azure-identity==1.12.0 +azure-core==1.27.1 +azure-identity==1.13.0 azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 -azure-mgmt-resource==23.0.0 +azure-mgmt-resource==23.0.1 azure-mgmt-subscription==3.1.1 Babel==2.12.1 bcrypt==4.0.1 bidict==0.22.1 blinker==1.6.2 -boto3==1.26.148 -botocore==1.29.148 +boto3==1.26.163 +botocore==1.29.163 Brotli==1.0.9 cachetools==5.3.1 certifi==2023.5.7 @@ -34,19 +34,19 @@ Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 Flask-Security-Too==5.1.2 Flask-SocketIO==5.3.4 -Flask-SQLAlchemy==3.0.3 +Flask-SQLAlchemy==3.0.5 Flask-WTF==1.1.1 -google-api-core==2.11.0 -google-api-python-client==2.88.0 -google-auth==2.19.1 +google-api-core==2.11.1 +google-api-python-client==2.91.0 +google-auth==2.21.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==1.0.0 -googleapis-common-protos==1.59.0 +googleapis-common-protos==1.59.1 greenlet==1.1.2 httpagentparser==1.9.5 httplib2==0.22.0 idna==3.4 -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 isodate==0.6.1 itsdangerous==2.1.2 jaraco.classes==3.2.3 @@ -64,11 +64,11 @@ msrest==0.7.1 oauthlib==3.2.2 paramiko==3.2.0 passlib==1.7.4 -pgadmin4 @ file:///home/app_upgrader/pgadmin4-7.3-py3-none-any.whl#sha256=972457d668607ca09ec1a408e38fb3b312dabff76814b004cfffa352276e53bb +pgadmin4 @ file:///home/app_upgrader/pgadmin4-7.4-py3-none-any.whl#sha256=a19eb21ba103143ad88ec8b915c02382d18789d94d04b592930dda3273ac1bc7 Pillow==9.5.0 pkg_resources==0.0.0 portalocker==2.7.0 -protobuf==4.23.2 +protobuf==4.23.3 psutil==5.9.5 psycopg==3.1.8 psycopg-c==3.1.8 @@ -78,7 +78,7 @@ pycparser==2.21 PyJWT==2.7.0 PyNaCl==1.5.0 pyotp==2.8.0 -pyparsing==3.0.9 +pyparsing==3.1.0 pypng==0.20220715.0 python-dateutil==2.8.2 python-engineio==4.4.1 @@ -92,10 +92,10 @@ s3transfer==0.6.1 SecretStorage==3.3.3 six==1.16.0 speaklater3==1.4 -SQLAlchemy==2.0.15 +SQLAlchemy==2.0.17 sqlparse==0.4.4 sshtunnel==0.4.0 -typing_extensions==4.6.3 +typing_extensions==4.7.0 ua-parser==0.16.1 uritemplate==4.1.1 urllib3==1.26.16 From 134e959abdab637d2552e0fa8348603759f386c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 28 Jul 2023 00:50:13 +0200 Subject: [PATCH 19/21] Upgrade pgadmin to 7.5 --- conf/armv7_bookworm.src | 4 +-- conf/armv7_bullseye.src | 4 +-- conf/requirement_bookworm.txt | 50 +++++++++++++++++------------------ conf/requirement_bullseye.txt | 50 +++++++++++++++++------------------ 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/conf/armv7_bookworm.src b/conf/armv7_bookworm.src index 983640e..102150a 100644 --- a/conf/armv7_bookworm.src +++ b/conf/armv7_bookworm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.4/pgadmin_4-7.4-bookworm-bin1_armv7l.tar.gz -SOURCE_SUM=3e07e653ddbd0e4e7faaa08a7266a65eb4e28017aceb1719bb71a17dca8a9cb1 +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.5/pgadmin_4-7.5-bookworm-bin1_armv7l.tar.gz +SOURCE_SUM=2b73060fe05a719f182ed8b14ec5bae9b8993c0e82570c2e14d4ee1b7dc5abfd # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/armv7_bullseye.src b/conf/armv7_bullseye.src index b6627c3..e2038e2 100644 --- a/conf/armv7_bullseye.src +++ b/conf/armv7_bullseye.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.4/pgadmin_4-7.4-bullseye-bin1_armv7l.tar.gz -SOURCE_SUM=8f1310bd97b68ff9dca6909b0ddc765e004f183baef4451a273c5a74230530cb +SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-7.5/pgadmin_4-7.5-bullseye-bin1_armv7l.tar.gz +SOURCE_SUM=d1c69acd257ee138615e7258a77ae8f796f9bf62cf20cfa3dcb8762412af1aea # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index e083b7d..3f290a6 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,7 +1,7 @@ alembic==1.11.1 Authlib==1.2.1 azure-common==1.1.28 -azure-core==1.27.1 +azure-core==1.28.0 azure-identity==1.13.0 azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 @@ -11,16 +11,16 @@ Babel==2.12.1 bcrypt==4.0.1 bidict==0.22.1 blinker==1.6.2 -boto3==1.26.164 -botocore==1.29.164 +boto3==1.28.13 +botocore==1.31.13 Brotli==1.0.9 cachetools==5.3.1 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -charset-normalizer==3.1.0 -click==8.1.3 -cryptography==40.0.2 -dnspython==2.3.0 +charset-normalizer==3.2.0 +click==8.1.6 +cryptography==41.0.2 +dnspython==2.4.1 email-validator==2.0.0.post2 eventlet==0.33.3 Flask==2.2.5 @@ -33,12 +33,12 @@ Flask-Migrate==4.0.4 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 Flask-Security-Too==5.1.2 -Flask-SocketIO==5.3.4 +Flask-SocketIO==5.3.5 Flask-SQLAlchemy==3.0.5 Flask-WTF==1.1.1 google-api-core==2.11.1 -google-api-python-client==2.91.0 -google-auth==2.21.0 +google-api-python-client==2.95.0 +google-auth==2.22.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==1.0.0 googleapis-common-protos==1.59.1 @@ -46,10 +46,10 @@ greenlet==2.0.2 httpagentparser==1.9.5 httplib2==0.22.0 idna==3.4 -importlib-metadata==6.7.0 +importlib-metadata==6.8.0 isodate==0.6.1 itsdangerous==2.1.2 -jaraco.classes==3.2.3 +jaraco.classes==3.3.0 jeepney==0.8.0 Jinja2==3.1.2 jmespath==1.0.1 @@ -57,30 +57,30 @@ keyring==23.13.1 ldap3==2.9.1 Mako==1.2.4 MarkupSafe==2.1.3 -more-itertools==9.1.0 -msal==1.22.0 +more-itertools==10.0.0 +msal==1.23.0 msal-extensions==1.0.0 msrest==0.7.1 oauthlib==3.2.2 paramiko==3.2.0 passlib==1.7.4 -pgadmin4 @ file:///root/pgadmin4-7.4-py3-none-any.whl#sha256=c92876a5f44e45cf83c0790adcb99dca1d7fad4780ea34ef3013cb13f9331f6a +pgadmin4 @ file:///root/pgadmin4-7.5-py3-none-any.whl#sha256=d734934b655ea662ff9bae35bf79c997db532a28e4ff06d98b0fc4b2eb379ceb Pillow==9.5.0 portalocker==2.7.0 -protobuf==4.23.3 +protobuf==4.23.4 psutil==5.9.5 -psycopg==3.1.8 -psycopg-c==3.1.8 +psycopg==3.1.9 +psycopg-c==3.1.9 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -PyJWT==2.7.0 +PyJWT==2.8.0 PyNaCl==1.5.0 pyotp==2.8.0 pyparsing==3.1.0 pypng==0.20220715.0 python-dateutil==2.8.2 -python-engineio==4.4.1 +python-engineio==4.5.1 python-socketio==5.8.0 pytz==2023.3 qrcode==7.4.2 @@ -91,14 +91,14 @@ s3transfer==0.6.1 SecretStorage==3.3.3 six==1.16.0 speaklater3==1.4 -SQLAlchemy==2.0.17 +SQLAlchemy==2.0.19 sqlparse==0.4.4 sshtunnel==0.4.0 -typing_extensions==4.7.0 -ua-parser==0.16.1 +typing_extensions==4.7.1 +ua-parser==0.18.0 uritemplate==4.1.1 urllib3==1.26.16 user-agents==2.2.0 Werkzeug==2.2.3 WTForms==3.0.1 -zipp==3.15.0 +zipp==3.16.2 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 87d240e..1413ab2 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,7 +1,7 @@ alembic==1.11.1 Authlib==1.2.1 azure-common==1.1.28 -azure-core==1.27.1 +azure-core==1.28.0 azure-identity==1.13.0 azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 @@ -11,16 +11,16 @@ Babel==2.12.1 bcrypt==4.0.1 bidict==0.22.1 blinker==1.6.2 -boto3==1.26.163 -botocore==1.29.163 +boto3==1.28.13 +botocore==1.31.13 Brotli==1.0.9 cachetools==5.3.1 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -charset-normalizer==3.1.0 -click==8.1.3 -cryptography==40.0.2 -dnspython==2.3.0 +charset-normalizer==3.2.0 +click==8.1.6 +cryptography==41.0.2 +dnspython==2.4.1 email-validator==2.0.0.post2 eventlet==0.33.3 Flask==2.2.5 @@ -33,12 +33,12 @@ Flask-Migrate==4.0.4 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 Flask-Security-Too==5.1.2 -Flask-SocketIO==5.3.4 +Flask-SocketIO==5.3.5 Flask-SQLAlchemy==3.0.5 Flask-WTF==1.1.1 google-api-core==2.11.1 -google-api-python-client==2.91.0 -google-auth==2.21.0 +google-api-python-client==2.95.0 +google-auth==2.22.0 google-auth-httplib2==0.1.0 google-auth-oauthlib==1.0.0 googleapis-common-protos==1.59.1 @@ -46,10 +46,10 @@ greenlet==1.1.2 httpagentparser==1.9.5 httplib2==0.22.0 idna==3.4 -importlib-metadata==6.7.0 +importlib-metadata==6.8.0 isodate==0.6.1 itsdangerous==2.1.2 -jaraco.classes==3.2.3 +jaraco.classes==3.3.0 jeepney==0.8.0 Jinja2==3.1.2 jmespath==1.0.1 @@ -57,31 +57,31 @@ keyring==23.13.1 ldap3==2.9.1 Mako==1.2.4 MarkupSafe==2.1.3 -more-itertools==9.1.0 -msal==1.22.0 +more-itertools==10.0.0 +msal==1.23.0 msal-extensions==1.0.0 msrest==0.7.1 oauthlib==3.2.2 paramiko==3.2.0 passlib==1.7.4 -pgadmin4 @ file:///home/app_upgrader/pgadmin4-7.4-py3-none-any.whl#sha256=a19eb21ba103143ad88ec8b915c02382d18789d94d04b592930dda3273ac1bc7 +pgadmin4 @ file:///home/app_upgrader/pgadmin4-7.5-py3-none-any.whl#sha256=f2364df1112c77710be346a53419c98992e9be0f3af1786957e4981a3955635c Pillow==9.5.0 pkg_resources==0.0.0 portalocker==2.7.0 -protobuf==4.23.3 +protobuf==4.23.4 psutil==5.9.5 -psycopg==3.1.8 -psycopg-c==3.1.8 +psycopg==3.1.9 +psycopg-c==3.1.9 pyasn1==0.5.0 pyasn1-modules==0.3.0 pycparser==2.21 -PyJWT==2.7.0 +PyJWT==2.8.0 PyNaCl==1.5.0 pyotp==2.8.0 pyparsing==3.1.0 pypng==0.20220715.0 python-dateutil==2.8.2 -python-engineio==4.4.1 +python-engineio==4.5.1 python-socketio==5.8.0 pytz==2023.3 qrcode==7.4.2 @@ -92,14 +92,14 @@ s3transfer==0.6.1 SecretStorage==3.3.3 six==1.16.0 speaklater3==1.4 -SQLAlchemy==2.0.17 +SQLAlchemy==2.0.19 sqlparse==0.4.4 sshtunnel==0.4.0 -typing_extensions==4.7.0 -ua-parser==0.16.1 +typing_extensions==4.7.1 +ua-parser==0.18.0 uritemplate==4.1.1 urllib3==1.26.16 user-agents==2.2.0 Werkzeug==2.2.3 WTForms==3.0.1 -zipp==3.15.0 +zipp==3.16.2 From 4210c481d5da6649afb24e88b252a0d1cd8c7d27 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 28 Jul 2023 06:01:01 +0000 Subject: [PATCH 20/21] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5d00c24..4e9df20 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Shipped version:** 6.20~ynh1 +**Shipped version:** 7.2~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 0285d8a..99d8b16 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Version incluse :** 6.20~ynh1 +**Version incluse :** 7.2~ynh1 ## Captures d’écran From 4fbdb071f8105450d17b8370a7ed6e8dfeafdaae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 28 Jul 2023 08:10:16 +0200 Subject: [PATCH 21/21] Fix requirement.txt --- conf/requirement_bookworm.txt | 2 +- conf/requirement_bullseye.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 3f290a6..978447d 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -64,7 +64,7 @@ msrest==0.7.1 oauthlib==3.2.2 paramiko==3.2.0 passlib==1.7.4 -pgadmin4 @ file:///root/pgadmin4-7.5-py3-none-any.whl#sha256=d734934b655ea662ff9bae35bf79c997db532a28e4ff06d98b0fc4b2eb379ceb +pgadmin4==7.5 Pillow==9.5.0 portalocker==2.7.0 protobuf==4.23.4 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 1413ab2..acf93c3 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -64,7 +64,7 @@ msrest==0.7.1 oauthlib==3.2.2 paramiko==3.2.0 passlib==1.7.4 -pgadmin4 @ file:///home/app_upgrader/pgadmin4-7.5-py3-none-any.whl#sha256=f2364df1112c77710be346a53419c98992e9be0f3af1786957e4981a3955635c +pgadmin4==7.5 Pillow==9.5.0 pkg_resources==0.0.0 portalocker==2.7.0