From 4e14d3f0d1d395b3d8b4a03c27dc312b72dfcaca Mon Sep 17 00:00:00 2001 From: App auto update Date: Sun, 25 Aug 2024 21:01:33 +0000 Subject: [PATCH 1/3] Upgrade pgadmin to 8.11 --- conf/requirement_bookworm.txt | 55 ++++++++++++++++++----------------- conf/requirement_bullseye.txt | 53 +++++++++++++++++---------------- manifest.toml | 10 +++---- 3 files changed, 62 insertions(+), 56 deletions(-) diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index aee430a..dfafe66 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -7,19 +7,20 @@ azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 azure-mgmt-resource==23.1.1 azure-mgmt-subscription==3.1.1 -Babel==2.15.0 -bcrypt==4.1.3 +babel==2.16.0 +backports.tarfile==1.2.0 +bcrypt==4.2.0 bidict==0.23.1 blinker==1.8.2 -boto3==1.34.150 -botocore==1.34.150 +boto3==1.34.162 +botocore==1.34.162 Brotli==1.1.0 -cachetools==5.4.0 +cachetools==5.5.0 certifi==2024.7.4 -cffi==1.16.0 +cffi==1.17.0 charset-normalizer==3.3.2 click==8.1.7 -cryptography==42.0.8 +cryptography==43.0.0 dnspython==2.6.1 email_validator==2.2.0 eventlet==0.36.1 @@ -31,49 +32,51 @@ Flask-Mail==0.10.0 Flask-Migrate==4.0.7 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 -Flask-Security-Too==5.4.3 +Flask-Security-Too==5.5.2 Flask-SocketIO==5.3.6 Flask-SQLAlchemy==3.1.1 Flask-WTF==1.2.1 google-api-core==2.19.1 -google-api-python-client==2.138.0 -google-auth==2.32.0 +google-api-python-client==2.142.0 +google-auth==2.34.0 google-auth-httplib2==0.2.0 -google-auth-oauthlib==1.2.0 +google-auth-oauthlib==1.2.1 googleapis-common-protos==1.63.2 greenlet==3.0.3 -gunicorn==22.0.0 +gunicorn==23.0.0 h11==0.14.0 httplib2==0.22.0 -idna==3.7 -importlib_metadata==8.2.0 -importlib_resources==6.4.0 +idna==3.8 +importlib_metadata==8.4.0 +importlib_resources==6.4.4 isodate==0.6.1 itsdangerous==2.2.0 jaraco.classes==3.4.0 +jaraco.context==6.0.1 +jaraco.functools==4.0.2 jeepney==0.8.0 Jinja2==3.1.4 jmespath==1.0.1 jsonformatter==0.3.2 -keyring==24.3.1 +keyring==25.3.0 ldap3==2.9.1 libgravatar==1.0.4 Mako==1.3.5 markdown-it-py==3.0.0 MarkupSafe==2.1.5 mdurl==0.1.2 -more-itertools==10.3.0 +more-itertools==10.4.0 msal==1.30.0 msal-extensions==1.2.0 msrest==0.7.1 oauthlib==3.2.2 packaging==24.1 -paramiko==3.4.0 +paramiko==3.4.1 passlib==1.7.4 -pgadmin4==8.10 +pgadmin4==8.11 portalocker==2.10.1 proto-plus==1.24.0 -protobuf==5.27.2 +protobuf==5.27.3 psutil==6.0.0 psycopg==3.2.1 psycopg-c==3.2.1 @@ -81,10 +84,10 @@ pyasn1==0.6.0 pyasn1_modules==0.4.0 pycparser==2.22 Pygments==2.18.0 -PyJWT==2.8.0 +PyJWT==2.9.0 PyNaCl==1.5.0 pyotp==2.9.0 -pyparsing==3.1.2 +pyparsing==3.1.4 pypng==0.20220715.0 python-dateutil==2.9.0.post0 python-engineio==4.9.1 @@ -101,17 +104,17 @@ shellingham==1.5.4 simple-websocket==1.0.0 six==1.16.0 speaklater3==1.4 -SQLAlchemy==2.0.31 +SQLAlchemy==2.0.32 sqlparse==0.5.1 sshtunnel==0.4.0 -typer==0.12.3 +typer==0.12.5 typing_extensions==4.12.2 ua-parser==0.18.0 uritemplate==4.1.1 urllib3==1.26.19 user-agents==2.2.0 -Werkzeug==3.0.3 +Werkzeug==3.0.4 wsproto==1.2.0 WTForms==3.1.2 -zipp==3.19.2 +zipp==3.20.0 zstandard==0.23.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 18b85cc..e28a700 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -7,19 +7,20 @@ azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 azure-mgmt-resource==23.1.1 azure-mgmt-subscription==3.1.1 -Babel==2.15.0 -bcrypt==4.1.3 +babel==2.16.0 +backports.tarfile==1.2.0 +bcrypt==4.2.0 bidict==0.23.1 blinker==1.8.2 -boto3==1.34.149 -botocore==1.34.149 +boto3==1.34.162 +botocore==1.34.162 Brotli==1.1.0 -cachetools==5.4.0 +cachetools==5.5.0 certifi==2024.7.4 -cffi==1.16.0 +cffi==1.17.0 charset-normalizer==3.3.2 click==8.1.7 -cryptography==42.0.8 +cryptography==43.0.0 dnspython==2.6.1 email_validator==2.2.0 eventlet==0.36.1 @@ -36,44 +37,46 @@ Flask-SocketIO==5.3.6 Flask-SQLAlchemy==3.1.1 Flask-WTF==1.2.1 google-api-core==2.19.1 -google-api-python-client==2.138.0 -google-auth==2.32.0 +google-api-python-client==2.142.0 +google-auth==2.34.0 google-auth-httplib2==0.2.0 -google-auth-oauthlib==1.2.0 +google-auth-oauthlib==1.2.1 googleapis-common-protos==1.63.2 greenlet==1.1.2 -gunicorn==22.0.0 +gunicorn==23.0.0 h11==0.14.0 httplib2==0.22.0 -idna==3.7 -importlib_metadata==8.2.0 -importlib_resources==6.4.0 +idna==3.8 +importlib_metadata==8.4.0 +importlib_resources==6.4.4 isodate==0.6.1 itsdangerous==2.2.0 jaraco.classes==3.4.0 +jaraco.context==6.0.1 +jaraco.functools==4.0.2 jeepney==0.8.0 Jinja2==3.1.4 jmespath==1.0.1 jsonformatter==0.3.2 -keyring==24.3.1 +keyring==25.3.0 ldap3==2.9.1 libgravatar==1.0.4 Mako==1.3.5 markdown-it-py==3.0.0 MarkupSafe==2.1.5 mdurl==0.1.2 -more-itertools==10.3.0 +more-itertools==10.4.0 msal==1.30.0 msal-extensions==1.2.0 msrest==0.7.1 oauthlib==3.2.2 packaging==24.1 -paramiko==3.4.0 +paramiko==3.4.1 passlib==1.7.4 -pgadmin4==8.10 +pgadmin4==8.11 portalocker==2.10.1 proto-plus==1.24.0 -protobuf==5.27.2 +protobuf==5.27.3 psutil==6.0.0 psycopg==3.2.1 psycopg-c==3.2.1 @@ -81,10 +84,10 @@ pyasn1==0.6.0 pyasn1_modules==0.4.0 pycparser==2.22 Pygments==2.18.0 -PyJWT==2.8.0 +PyJWT==2.9.0 PyNaCl==1.5.0 pyotp==2.9.0 -pyparsing==3.1.2 +pyparsing==3.1.4 pypng==0.20220715.0 python-dateutil==2.9.0.post0 python-engineio==4.9.1 @@ -101,17 +104,17 @@ shellingham==1.5.4 simple-websocket==1.0.0 six==1.16.0 speaklater3==1.4 -SQLAlchemy==2.0.31 +SQLAlchemy==2.0.32 sqlparse==0.5.1 sshtunnel==0.4.0 -typer==0.12.3 +typer==0.12.5 typing_extensions==4.12.2 ua-parser==0.18.0 uritemplate==4.1.1 urllib3==1.26.19 user-agents==2.2.0 -Werkzeug==3.0.3 +Werkzeug==3.0.4 wsproto==1.2.0 WTForms==3.1.2 -zipp==3.19.2 +zipp==3.20.0 zstandard==0.23.0 diff --git a/manifest.toml b/manifest.toml index d37e0e0..6b9664f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "pgAdmin4" description.en = "Manage PostgreSQL databases over the web" description.fr = "Application web de gestion des bases de données PostgreSQL" -version = "8.10~ynh1" +version = "8.11~ynh1" maintainers = ["Josué Tille"] @@ -42,13 +42,13 @@ ram.runtime = "200M" [resources] [resources.sources.pgadmin_prebuilt_armv7_bookworm] prefetch = false - armhf.url = "https://github.com/YunoHost-Apps/pgadmin_python_build/releases/download/v8.10/pgadmin_8.10-bookworm-bin1_armv7l.tar.gz" - armhf.sha256 = "a4887ee52021bbb196f93af8fb87d62767cb95ada14b09fd1810fe192f1f4d50" + armhf.url = "https://github.com/YunoHost-Apps/pgadmin_python_build/releases/download/v8.11/pgadmin_8.11-bookworm-bin1_armv7l.tar.gz" + armhf.sha256 = "c0598bde6939c34eca005c47f166048fc3a625b5d309ce25b4895c19012c3211" [resources.sources.pgadmin_prebuilt_armv7_bullseye] prefetch = false - armhf.url = "https://github.com/YunoHost-Apps/pgadmin_python_build/releases/download/v8.10/pgadmin_8.10-bullseye-bin1_armv7l.tar.gz" - armhf.sha256 = "db74667fd08b7bc0115da36101221119c62e27d5561ccaf8dfb68009dfd6544e" + armhf.url = "https://github.com/YunoHost-Apps/pgadmin_python_build/releases/download/v8.11/pgadmin_8.11-bullseye-bin1_armv7l.tar.gz" + armhf.sha256 = "867f48dc5e5712e5f84aca7ffe9f0d3467cb9a97cb28efec53bd90811b6edd5a" [resources.system_user] allow_email = true From 65b809428b56e783dcc758bcf9ddd97458308779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sun, 25 Aug 2024 23:17:24 +0200 Subject: [PATCH 2/3] Force pip<24.1 to fix https://github.com/pgadmin-org/pgadmin4/issues/7836 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index aaeac80..47b6a19 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -46,7 +46,7 @@ install_source() { # Install pgadmin in virtualenv pip="$install_dir"/venv/bin/pip - $pip install --upgrade pip wheel + $pip install --upgrade 'pip<24.1' wheel $pip install --upgrade -r "$YNH_APP_BASEDIR/conf/requirement_$(lsb_release --codename --short).txt" fi From e889fe9394d76d95c51301f827864690f4b094eb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 25 Aug 2024 21:22:24 +0000 Subject: [PATCH 3/3] Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_ru.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 9 files changed, 55 insertions(+), 7 deletions(-) create mode 100644 README_ru.md diff --git a/ALL_README.md b/ALL_README.md index 4ed64dd..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -6,4 +6,5 @@ - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) - [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Прочитать README на русский](README_ru.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index f0b3162..5c2b0b0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Shipped version:** 8.10~ynh1 +**Shipped version:** 8.11~ynh1 ## Screenshots diff --git a/README_es.md b/README_es.md index f56c4d0..2d46014 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Versión actual:** 8.10~ynh1 +**Versión actual:** 8.11~ynh1 ## Capturas diff --git a/README_eu.md b/README_eu.md index 13c4e03..81f2717 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Paketatutako bertsioa:** 8.10~ynh1 +**Paketatutako bertsioa:** 8.11~ynh1 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index a40de7f..2e72752 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Version incluse :** 8.10~ynh1 +**Version incluse :** 8.11~ynh1 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 93474cc..ca134a8 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Versión proporcionada:** 8.10~ynh1 +**Versión proporcionada:** 8.11~ynh1 ## Capturas de pantalla diff --git a/README_id.md b/README_id.md index 189ed50..b5de711 100644 --- a/README_id.md +++ b/README_id.md @@ -19,7 +19,7 @@ Ini TIDAK boleh diedit dengan tangan. pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**Versi terkirim:** 8.10~ynh1 +**Versi terkirim:** 8.11~ynh1 ## Tangkapan Layar diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..3a8759e --- /dev/null +++ b/README_ru.md @@ -0,0 +1,47 @@ + + +# pgAdmin4 для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/pgadmin.svg)](https://ci-apps.yunohost.org/ci/apps/pgadmin/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) + +[![Установите pgAdmin4 с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить pgAdmin4 быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. + + +**Поставляемая версия:** 8.11~ynh1 + +## Снимки экрана + +![Снимок экрана pgAdmin4](./doc/screenshots/pgadmin4-welcome-light.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация администратора: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug +или +sudo yunohost app upgrade pgadmin -u https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 95b7d80..1baab9f 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. -**分发版本：** 8.10~ynh1 +**分发版本：** 8.11~ynh1 ## 截图