From 852d880e8521cf4bca381a0aa9c867031a1fa32a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 12 Mar 2024 15:31:41 +0100 Subject: [PATCH] Upgrade pgadmin to 8.4 --- conf/requirement_bookworm.txt | 53 +++++++++++++++++----------------- conf/requirement_bullseye.txt | 54 +++++++++++++++++------------------ manifest.toml | 8 +++--- 3 files changed, 58 insertions(+), 57 deletions(-) diff --git a/conf/requirement_bookworm.txt b/conf/requirement_bookworm.txt index 946917c..784a6cc 100644 --- a/conf/requirement_bookworm.txt +++ b/conf/requirement_bookworm.txt @@ -1,7 +1,7 @@ alembic==1.13.1 Authlib==1.2.1 azure-common==1.1.28 -azure-core==1.30.0 +azure-core==1.30.1 azure-identity==1.15.0 azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 @@ -9,20 +9,20 @@ azure-mgmt-resource==23.0.1 azure-mgmt-subscription==3.1.1 Babel==2.14.0 bcrypt==4.0.1 -bidict==0.22.1 +bidict==0.23.1 blinker==1.7.0 boto3==1.33.13 botocore==1.33.13 Brotli==1.1.0 -cachetools==5.3.2 +cachetools==5.3.3 certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -cryptography==41.0.7 -dnspython==2.5.0 -email-validator==2.1.0.post1 +cryptography==42.0.5 +dnspython==2.6.1 +email_validator==2.1.1 eventlet==0.34.2 Flask==2.3.3 flask-babel==4.0.0 @@ -30,49 +30,51 @@ Flask-Compress==1.14 Flask-Gravatar==0.5.0 Flask-Login==0.6.3 Flask-Mail==0.9.1 -Flask-Migrate==4.0.5 +Flask-Migrate==4.0.7 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 -Flask-Security-Too==5.2.0 +Flask-Security-Too==5.3.3 Flask-SocketIO==5.3.6 Flask-SQLAlchemy==3.1.1 Flask-WTF==1.2.1 -google-api-core==2.17.0 -google-api-python-client==2.117.0 -google-auth==2.27.0 +google-api-core==2.17.1 +google-api-python-client==2.121.0 +google-auth==2.28.2 google-auth-httplib2==0.2.0 google-auth-oauthlib==1.1.0 -googleapis-common-protos==1.62.0 +googleapis-common-protos==1.63.0 greenlet==3.0.3 +gunicorn==21.2.0 h11==0.14.0 httpagentparser==1.9.5 httplib2==0.22.0 idna==3.6 -importlib-metadata==7.0.1 -importlib-resources==6.1.1 +importlib_metadata==7.0.2 +importlib_resources==6.1.3 isodate==0.6.1 itsdangerous==2.1.2 jaraco.classes==3.3.1 jeepney==0.8.0 Jinja2==3.1.3 jmespath==1.0.1 -keyring==24.3.0 +jsonformatter==0.3.2 +keyring==24.3.1 ldap3==2.9.1 Mako==1.3.2 markdown-it-py==3.0.0 MarkupSafe==2.1.5 mdurl==0.1.2 more-itertools==10.2.0 -msal==1.26.0 +msal==1.27.0 msal-extensions==1.1.0 msrest==0.7.1 oauthlib==3.2.2 -packaging==23.2 +packaging==24.0 paramiko==3.4.0 passlib==1.7.4 -pgadmin4==8.3 +pgadmin4==8.4 portalocker==2.8.2 -protobuf==4.25.2 +protobuf==4.25.3 psutil==5.9.8 psycopg==3.1.12 psycopg-c==3.1.12 @@ -83,16 +85,16 @@ Pygments==2.17.2 PyJWT==2.8.0 PyNaCl==1.5.0 pyotp==2.9.0 -pyparsing==3.1.1 +pyparsing==3.1.2 pypng==0.20220715.0 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 python-engineio==4.9.0 python-socketio==5.11.1 pytz==2023.4 qrcode==7.4.2 requests==2.31.0 -requests-oauthlib==1.3.1 -rich==13.7.0 +requests-oauthlib==1.4.0 +rich==13.7.1 rsa==4.9 s3transfer==0.8.2 SecretStorage==3.3.3 @@ -100,11 +102,11 @@ shellingham==1.5.4 simple-websocket==1.0.0 six==1.16.0 speaklater3==1.4 -SQLAlchemy==2.0.25 +SQLAlchemy==2.0.28 sqlparse==0.4.4 sshtunnel==0.4.0 typer==0.9.0 -typing_extensions==4.9.0 +typing_extensions==4.10.0 ua-parser==0.18.0 uritemplate==4.1.1 urllib3==1.26.18 @@ -113,4 +115,3 @@ Werkzeug==2.3.8 wsproto==1.2.0 WTForms==3.1.2 zipp==3.17.0 -gunicorn==21.2.0 diff --git a/conf/requirement_bullseye.txt b/conf/requirement_bullseye.txt index 76e800a..d0baf57 100644 --- a/conf/requirement_bullseye.txt +++ b/conf/requirement_bullseye.txt @@ -1,7 +1,7 @@ alembic==1.13.1 Authlib==1.2.1 azure-common==1.1.28 -azure-core==1.30.0 +azure-core==1.30.1 azure-identity==1.15.0 azure-mgmt-core==1.4.0 azure-mgmt-rdbms==10.1.0 @@ -9,20 +9,20 @@ azure-mgmt-resource==23.0.1 azure-mgmt-subscription==3.1.1 Babel==2.14.0 bcrypt==4.0.1 -bidict==0.22.1 +bidict==0.23.1 blinker==1.7.0 boto3==1.33.13 botocore==1.33.13 Brotli==1.1.0 -cachetools==5.3.2 +cachetools==5.3.3 certifi==2024.2.2 cffi==1.16.0 charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -cryptography==41.0.7 -dnspython==2.5.0 -email-validator==2.1.0.post1 +cryptography==42.0.5 +dnspython==2.6.1 +email_validator==2.1.1 eventlet==0.34.2 Flask==2.3.3 flask-babel==4.0.0 @@ -30,50 +30,51 @@ Flask-Compress==1.14 Flask-Gravatar==0.5.0 Flask-Login==0.6.3 Flask-Mail==0.9.1 -Flask-Migrate==4.0.5 +Flask-Migrate==4.0.7 Flask-Paranoid==0.3.0 Flask-Principal==0.4.0 -Flask-Security-Too==5.2.0 +Flask-Security-Too==5.3.3 Flask-SocketIO==5.3.6 Flask-SQLAlchemy==3.1.1 Flask-WTF==1.2.1 -google-api-core==2.17.0 -google-api-python-client==2.117.0 -google-auth==2.27.0 +google-api-core==2.17.1 +google-api-python-client==2.121.0 +google-auth==2.28.2 google-auth-httplib2==0.2.0 google-auth-oauthlib==1.1.0 -googleapis-common-protos==1.62.0 +googleapis-common-protos==1.63.0 greenlet==1.1.2 +gunicorn==21.2.0 h11==0.14.0 httpagentparser==1.9.5 httplib2==0.22.0 idna==3.6 -importlib-metadata==7.0.1 -importlib-resources==6.1.1 +importlib_metadata==7.0.2 +importlib_resources==6.1.3 isodate==0.6.1 itsdangerous==2.1.2 jaraco.classes==3.3.1 jeepney==0.8.0 Jinja2==3.1.3 jmespath==1.0.1 -keyring==24.3.0 +jsonformatter==0.3.2 +keyring==24.3.1 ldap3==2.9.1 Mako==1.3.2 markdown-it-py==3.0.0 MarkupSafe==2.1.5 mdurl==0.1.2 more-itertools==10.2.0 -msal==1.26.0 +msal==1.27.0 msal-extensions==1.1.0 msrest==0.7.1 oauthlib==3.2.2 -packaging==23.2 +packaging==24.0 paramiko==3.4.0 passlib==1.7.4 -pgadmin4==8.3 -pkg_resources==0.0.0 +pgadmin4==8.4 portalocker==2.8.2 -protobuf==4.25.2 +protobuf==4.25.3 psutil==5.9.8 psycopg==3.1.12 psycopg-c==3.1.12 @@ -84,16 +85,16 @@ Pygments==2.17.2 PyJWT==2.8.0 PyNaCl==1.5.0 pyotp==2.9.0 -pyparsing==3.1.1 +pyparsing==3.1.2 pypng==0.20220715.0 -python-dateutil==2.8.2 +python-dateutil==2.9.0.post0 python-engineio==4.9.0 python-socketio==5.11.1 pytz==2023.4 qrcode==7.4.2 requests==2.31.0 -requests-oauthlib==1.3.1 -rich==13.7.0 +requests-oauthlib==1.4.0 +rich==13.7.1 rsa==4.9 s3transfer==0.8.2 SecretStorage==3.3.3 @@ -101,11 +102,11 @@ shellingham==1.5.4 simple-websocket==1.0.0 six==1.16.0 speaklater3==1.4 -SQLAlchemy==2.0.25 +SQLAlchemy==2.0.28 sqlparse==0.4.4 sshtunnel==0.4.0 typer==0.9.0 -typing_extensions==4.9.0 +typing_extensions==4.10.0 ua-parser==0.18.0 uritemplate==4.1.1 urllib3==1.26.18 @@ -114,4 +115,3 @@ Werkzeug==2.3.8 wsproto==1.2.0 WTForms==3.1.2 zipp==3.17.0 -gunicorn==21.2.0 diff --git a/manifest.toml b/manifest.toml index 2c4c3a1..e2d8aa9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -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/v4-8.3/pgadmin_4-8.3-bookworm-bin1_armv7l.tar.gz" - armhf.sha256 = "b2fdf884fe74e2e6a41d8f5f8f4b1967bc4ad6fffcfa5a76fc34ef6fe6c62e7e" + armhf.url = "https://github.com/YunoHost-Apps/pgadmin_python_build/releases/download/v4-8.4/pgadmin_4-8.4-bookworm-bin1_armv7l.tar.gz" + armhf.sha256 = "6fb8d4dbc92ce27f8d8cf3f47b101c440ee9a10c640517b31ba69b4daa5a1220" [resources.sources.pgadmin_prebuilt_armv7_bullseye] prefetch = false - armhf.url = "https://github.com/YunoHost-Apps/pgadmin_python_build/releases/download/v4-8.3/pgadmin_4-8.3-bullseye-bin1_armv7l.tar.gz" - armhf.sha256 = "bf1136e71b52a9bb75b6e3bc75a23a5d49fa104291f8b3f0114593e123e0d078" + armhf.url = "https://github.com/YunoHost-Apps/pgadmin_python_build/releases/download/v4-8.4/pgadmin_4-8.4-bullseye-bin1_armv7l.tar.gz" + armhf.sha256 = "fd9aa4205bab9f0279c0b4e9672be014f150793d03224b9fd47fe1628580de6c" [resources.system_user] allow_email = true