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] 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",