public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/pgadmin4] f43: Update to 9.18
@ 2026-09-18 19:04 Sandro Mani
0 siblings, 0 replies; only message in thread
From: Sandro Mani @ 2026-09-18 19:04 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/pgadmin4
Branch : f43
Commit : ccc8608133aba36c85a260e41a64abff9f696184
Author : Sandro Mani <manisandro@gmail.com>
Date : 2026-09-18T21:04:04+02:00
Stats : +88/-72 in 9 file(s)
URL : https://src.fedoraproject.org/rpms/pgadmin4/c/ccc8608133aba36c85a260e41a64abff9f696184?branch=f43
Log:
Update to 9.18
---
diff --git a/.gitignore b/.gitignore
index ae6719e..3c86720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,5 @@
/pgadmin4-9.16-vendor.tar.xz
/pgadmin4-9.17.tar.gz
/pgadmin4-9.17-vendor.tar.xz
+/pgadmin4-9.18.tar.gz
+/pgadmin4-9.18-vendor.tar.xz
diff --git a/adjust_requirements.py b/adjust_requirements.py
index 1197cb7..25135d1 100755
--- a/adjust_requirements.py
+++ b/adjust_requirements.py
@@ -22,7 +22,8 @@ for idx, requirement in enumerate(requirements):
except:
base = requirement
platform = ""
- parts = re.split(r"([<>=~]+)", base)
+ parts = re.split(r"([<>=~]+)", base)[0:3]
+ parts[2] = parts[2].rstrip(",")
if 'sys_platform=="win32"' in platform:
continue
# special cases
@@ -30,8 +31,9 @@ for idx, requirement in enumerate(requirements):
parts[0] = "psycopg"
elif parts[0] == "typer[all]":
parts[0] = "typer"
- # prov = parts[0].lower().replace(r'[', r'\[').replace(r']', r'\]')
- prov = parts[0].lower().replace('[pil]', '').replace(r'[', r'\[').replace(r']', r'\]')
+ elif parts[0] == "qrcode[pil]":
+ parts[0] = "qrcode"
+ prov = parts[0].lower().replace(r'[', r'\[').replace(r']', r'\]')
print("Checking %s..." % parts[0])
if release == "rawhide":
cmd = ['dnf', '--disablerepo=*', '--releasever', release, '--enablerepo=rawhide', 'repoquery', '--whatprovides', 'python3dist(%s)' % prov, '--queryformat', '%{VERSION}\n']
@@ -46,9 +48,12 @@ for idx, requirement in enumerate(requirements):
parts[2] = version_required
if Version(version_available) < Version(version_required):
parts[2] = version_available
- requirements[idx] = "".join(parts)
+ new_req = "".join(parts)
if platform:
- requirements[idx] += "; " + platform
+ new_req += "; " + platform
+ print(" * OLD: %s" % requirements[idx])
+ print(" * NEW: %s" % new_req)
+ requirements[idx] = new_req
with open(requirements_path + ".new", 'w') as fh:
fh.write("\n".join(requirements))
diff --git a/pgadmin4-qt.cpp b/pgadmin4-qt.cpp
index 206fd69..fc3129d 100644
--- a/pgadmin4-qt.cpp
+++ b/pgadmin4-qt.cpp
@@ -140,7 +140,7 @@ int main(int argc, char* argv[]) {
view.setWindowTitle("pgAdmin4-qt - Unofficial runtime for pgadmin4");
view.resize(1024, 768);
view.load(url);
- view.showMaximized();
+ view.show();
splash.finish(&view);
QMessageBox::information(&view, "pgAdmin4-qt", "This is an unofficial runtime for pgAdmin4, developed specifically to ease packaging for Fedora. Some features might be missing compared to the official runtime. When using this runtime, please submit any issues to the Fedora bugtracker at <a href=\"https://bugzilla.redhat.com\">https://bugzilla.redhat.com</a>. There is no upstream support for this runtime.");
diff --git a/pgadmin4.spec b/pgadmin4.spec
index 1a810cc..fe252a5 100644
--- a/pgadmin4.spec
+++ b/pgadmin4.spec
@@ -6,8 +6,8 @@
Name: pgadmin4
# NOTE: Also regenerate requires as indicated below when updating!
# Verify Patch4 on next update
-Version: 9.17
-Release: 2%{?dist}
+Version: 9.18
+Release: 1%{?dist}
Summary: Administration tool for PostgreSQL
# i686, armv7hl: The webpack terser plugin aborts with JS heap memory exhaustion on these arches
@@ -78,7 +78,6 @@ Requires: python3dist(keyring) >= 25
Requires: python3dist(ldap3) >= 2
Requires: python3dist(libgravatar) >= 1
Requires: python3dist(paramiko) >= 3.5.1
-Requires: python3dist(passlib) >= 1
Requires: python3dist(psutil) >= 7
Requires: python3dist(psycopg) >= 3.2.9
Requires: python3dist(pyotp) >= 2
@@ -251,8 +250,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
-* Thu Aug 13 2026 Sandro Mani <manisandro@gmail.com> - 9.17-2
-- Restore compatibility with python-cryptography-47.x (#2484328)
+* Thu Sep 17 2026 Sandro Mani <manisandro@gmail.com> - 9.18-1
+- Update to 9.18
+
+* Thu Sep 03 2026 Sandro Mani <manisandro@gmail.com> - 9.17-2
+- Add patch to fix compatibility with pgadmin3 (#2527807)
* Fri Jul 31 2026 Sandro Mani <manisandro@gmail.com> - 9.17-1
- Update to 9.17
diff --git a/pgadmin4_azure-mgmt-rdbms.patch b/pgadmin4_azure-mgmt-rdbms.patch
index ae91a10..a5ff5c2 100644
--- a/pgadmin4_azure-mgmt-rdbms.patch
+++ b/pgadmin4_azure-mgmt-rdbms.patch
@@ -1,18 +1,20 @@
-diff -rupN --no-dereference pgadmin4-9.17/web/pgadmin/misc/cloud/azure/__init__.py pgadmin4-9.17-new/web/pgadmin/misc/cloud/azure/__init__.py
---- pgadmin4-9.17/web/pgadmin/misc/cloud/azure/__init__.py 2026-07-30 05:14:00.000000000 +0200
-+++ pgadmin4-9.17-new/web/pgadmin/misc/cloud/azure/__init__.py 2026-07-31 14:38:39.980998254 +0200
-@@ -31,8 +31,12 @@ from azure.identity import AzureCliCrede
- AuthenticationRecord
- from azure.mgmt.resource import ResourceManagementClient
- from azure.mgmt.subscription import SubscriptionClient
--from azure.mgmt.rdbms.postgresql_flexibleservers.models import \
-- NameAvailabilityRequest
-+try:
-+ from azure.mgmt.rdbms.postgresql.models import \
-+ NameAvailabilityRequest
-+except:
-+ from azure.mgmt.rdbms.postgresql_flexibleservers.models import \
-+ NameAvailabilityRequest
-
- MODULE_NAME = 'azure'
+diff -rupN --no-dereference pgadmin4-9.18/web/pgadmin/misc/cloud/azure/__init__.py pgadmin4-9.18-new/web/pgadmin/misc/cloud/azure/__init__.py
+--- pgadmin4-9.18/web/pgadmin/misc/cloud/azure/__init__.py 2026-09-15 15:17:59.000000000 +0200
++++ pgadmin4-9.18-new/web/pgadmin/misc/cloud/azure/__init__.py 2026-09-18 21:03:55.072581983 +0200
+@@ -267,9 +267,13 @@ def _azure_sdk():
+ from azure.mgmt.rdbms.postgresql_flexibleservers import (
+ PostgreSQLManagementClient
+ )
+- from azure.mgmt.rdbms.postgresql_flexibleservers.models import (
+- NameAvailabilityRequest
+- )
++ try:
++ from azure.mgmt.rdbms.postgresql.models import \
++ NameAvailabilityRequest
++ except:
++ from azure.mgmt.rdbms.postgresql_flexibleservers.models import \
++ NameAvailabilityRequest
++
+ from azure.mgmt.resource import ResourceManagementClient
+ from azure.mgmt.subscription import SubscriptionClient
diff --git a/pgadmin4_cryptography47.patch b/pgadmin4_cryptography47.patch
index 6cf8b96..50e914c 100644
--- a/pgadmin4_cryptography47.patch
+++ b/pgadmin4_cryptography47.patch
@@ -1,6 +1,6 @@
-diff -rupN pgadmin4-9.15/web/pgadmin/utils/crypto.py pgadmin4-9.15-new/web/pgadmin/utils/crypto.py
---- pgadmin4-9.15/web/pgadmin/utils/crypto.py 2026-05-06 13:30:07.000000000 +0200
-+++ pgadmin4-9.15-new/web/pgadmin/utils/crypto.py 2026-06-06 10:06:59.779901440 +0200
+diff -rupN --no-dereference pgadmin4-9.18/web/pgadmin/utils/crypto.py pgadmin4-9.18-new/web/pgadmin/utils/crypto.py
+--- pgadmin4-9.18/web/pgadmin/utils/crypto.py 2026-09-15 15:18:00.000000000 +0200
++++ pgadmin4-9.18-new/web/pgadmin/utils/crypto.py 2026-09-18 21:03:55.712481434 +0200
@@ -16,7 +16,7 @@ import os
from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives.ciphers import Cipher
diff --git a/pgadmin4_requirements.patch b/pgadmin4_requirements.patch
index ebe18de..4ffd6f3 100644
--- a/pgadmin4_requirements.patch
+++ b/pgadmin4_requirements.patch
@@ -1,20 +1,28 @@
---- pgadmin4-9.17/requirements.txt 2026-07-30 05:14:00.000000000 +0200
-+++ pgadmin4-9.17-new/requirements.txt 2026-07-31 16:03:30.884780019 +0200
-@@ -12,59 +12,59 @@
+diff -rupN --no-dereference pgadmin4-9.18/requirements.txt pgadmin4-9.18-new/requirements.txt
+--- pgadmin4-9.18/requirements.txt 2026-09-15 15:17:59.000000000 +0200
++++ pgadmin4-9.18-new/requirements.txt 2026-09-18 21:03:54.784257279 +0200
+@@ -12,64 +12,64 @@
# relevant packages.
###############################################################################
-Authlib==1.6.*; python_version <= '3.9'
--Authlib==1.7.*; python_version > '3.9'
+-Authlib==1.8.*; python_version > '3.9'
-azure-identity==1.25.3
-azure-mgmt-rdbms==10.1.1
--azure-mgmt-resource==25.0.0
++Authlib>=1.4.0; python_version <= '3.9'
++Authlib>=1.4.0; python_version > '3.9'
++azure-identity>=1.25.3
++azure-mgmt-rdbms>=10.1.1
+ # Azure CLI (a common companion package on Linux distros) still pins
+ # azure-mgmt-resource<25, so keep the lower bound at 24.0.0 to avoid
+ # conflicts for distro packagers; see pgadmin-org/pgadmin4#10247.
+-azure-mgmt-resource>=24.0.0,<26.0.0
-azure-mgmt-subscription==3.1.1
-bcrypt==5.0.*
-boto3==1.42.*; python_version <= '3.9'
-boto3==1.43.*; python_version > '3.9'
--certifi==2026.6.17
--cryptography==49.0.*
+-certifi==2026.7.22
+-cryptography==50.0.*
-Flask-Babel==4.0.*
-Flask-Compress==1.*
-Flask-Login==0.*
@@ -22,7 +30,24 @@
-Flask-Migrate==4.*
-Flask-Paranoid==0.*
-Flask-Security-Too==5.6.*; python_version <= '3.9'
--Flask-Security-Too==5.8.*; python_version > '3.9'
++azure-mgmt-resource>=24.0.0
++azure-mgmt-subscription>=3.0.0
++bcrypt>=4.3.0
++boto3>=1.42.0; python_version <= '3.9'
++boto3>=1.43.0; python_version > '3.9'
++certifi>=2025.07.09
++cryptography>=46.0.7
++Flask-Babel>=4.0.0
++Flask-Compress>=1.0
++Flask-Login>=0.0
++Flask-Mail>=0.0
++Flask-Migrate>=4.0
++Flask-Paranoid>=0.0
++Flask-Security-Too>=5.6.0; python_version <= '3.9'
+ # 5.8.2 corrected the inverted UserMixin.is_locked() test in LoginForm;
+ # User.is_locked() in web/pgadmin/model/__init__.py follows the fixed
+ # semantics, so anything earlier in the 5.8 series would refuse all logins.
+-Flask-Security-Too>=5.8.2,<5.9; python_version > '3.9'
-Flask-SocketIO==5.6.*
-Flask-SQLAlchemy==3.1.*
-Flask-WTF==1.2.*; python_version <= '3.9'
@@ -30,38 +55,19 @@
-Flask==3.1.*
-google-api-python-client==2.*
-google-auth-oauthlib==1.3.1; python_version <= '3.9'
--google-auth-oauthlib==1.4.0; python_version > '3.9'
--gssapi==1.11.*
+-google-auth-oauthlib==1.4.1; python_version > '3.9'
+-gssapi==1.12.*
-jsonformatter~=0.3.4
-keyring==25.*
-ldap3==2.*
-libgravatar==1.0.*
-paramiko==3.5.1
--passlib==1.*
-psutil==7.2.*
-psycopg[c]==3.2.13; python_version < '3.10'
-psycopg[c]==3.3.4; python_version >= '3.10'
-pyotp==2.*
-python-dateutil==2.*
-pytz==2026.*
-+Authlib>=1.4.0; python_version <= '3.9'
-+Authlib>=1.4.0; python_version > '3.9'
-+azure-identity>=1.25.3
-+azure-mgmt-rdbms>=10.1.1
-+azure-mgmt-resource>=24.0.0
-+azure-mgmt-subscription>=3.0.0
-+bcrypt>=4.3.0
-+boto3>=1.42.0; python_version <= '3.9'
-+boto3>=1.43.0; python_version > '3.9'
-+certifi>=2025.07.09
-+cryptography>=46.0.7
-+Flask-Babel>=4.0.0
-+Flask-Compress>=1.0
-+Flask-Login>=0.0
-+Flask-Mail>=0.0
-+Flask-Migrate>=4.0
-+Flask-Paranoid>=0.0
-+Flask-Security-Too>=5.6.0; python_version <= '3.9'
+Flask-Security-Too>=5.6.2; python_version > '3.9'
+Flask-SocketIO>=5.6.0
+Flask-SQLAlchemy>=3.0.5
@@ -77,7 +83,6 @@
+ldap3>=2.0
+libgravatar>=1.0.0
+paramiko>=3.5.1
-+passlib>=1.0
+psutil>=7.0.0
+psycopg>=3.2.9; python_version < '3.10'
+psycopg>=3.2.9; python_version >= '3.10'
@@ -88,19 +93,19 @@
pywinpty==2.0.*; sys_platform=="win32"
-qrcode[pil]==8.*
-setuptools<82; python_version <= '3.9'
--setuptools==83.*; python_version > '3.9'
+-setuptools==84.*; python_version > '3.9'
-SQLAlchemy==2.*
-sqlparse==0.*
-sshtunnel==0.*
-typer[all]==0.23.*; python_version <= '3.9'
--typer==0.26.*; python_version > '3.9'
+-typer==0.27.*; python_version > '3.9'
-urllib3==1.26.*; python_version <= '3.9'
-urllib3==2.7.*; python_version > '3.9'
-user-agents==2.2.0
-Werkzeug==3.1.*
-WTForms==3.1.*; python_version <= '3.9'
-WTForms==3.2.*; python_version > '3.9'
-+qrcode[pil]>=8.0
++qrcode>=8.0
+setuptools>=78.1.1; python_version <= '3.9'
+setuptools>=78.1.1; python_version > '3.9'
+SQLAlchemy>=2.0
diff --git a/pgadmin4_sphinx_youtube.patch b/pgadmin4_sphinx_youtube.patch
index 184d8d2..ee038c9 100644
--- a/pgadmin4_sphinx_youtube.patch
+++ b/pgadmin4_sphinx_youtube.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference pgadmin4-9.17/docs/en_US/conf.py pgadmin4-9.17-new/docs/en_US/conf.py
---- pgadmin4-9.17/docs/en_US/conf.py 2026-07-30 05:13:59.000000000 +0200
-+++ pgadmin4-9.17-new/docs/en_US/conf.py 2026-07-31 14:38:40.324622774 +0200
+diff -rupN --no-dereference pgadmin4-9.18/docs/en_US/conf.py pgadmin4-9.18-new/docs/en_US/conf.py
+--- pgadmin4-9.18/docs/en_US/conf.py 2026-09-15 15:17:58.000000000 +0200
++++ pgadmin4-9.18-new/docs/en_US/conf.py 2026-09-18 21:03:55.419462927 +0200
@@ -36,7 +36,8 @@ import config
# Add any Sphinx extension module names here, as strings. They can be
@@ -11,9 +11,9 @@ diff -rupN --no-dereference pgadmin4-9.17/docs/en_US/conf.py pgadmin4-9.17-new/d
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
-diff -rupN --no-dereference pgadmin4-9.17/docs/en_US/processes.rst pgadmin4-9.17-new/docs/en_US/processes.rst
---- pgadmin4-9.17/docs/en_US/processes.rst 2026-07-30 05:13:59.000000000 +0200
-+++ pgadmin4-9.17-new/docs/en_US/processes.rst 2026-07-31 14:38:40.324984850 +0200
+diff -rupN --no-dereference pgadmin4-9.18/docs/en_US/processes.rst pgadmin4-9.18-new/docs/en_US/processes.rst
+--- pgadmin4-9.18/docs/en_US/processes.rst 2026-09-15 15:17:59.000000000 +0200
++++ pgadmin4-9.18-new/docs/en_US/processes.rst 2026-09-18 21:03:55.419996323 +0200
@@ -47,9 +47,3 @@ Use the **End Process** button to end th
.. note:: If you are running *pgAdmin* in *Server Mode* you can click on the |sm_icon| icon in the process watcher window to open the file location in the Storage Manager. You can use the :ref:`Storage Manager <storage_manager>` to download the backup file on the client machine .
diff --git a/sources b/sources
index 42ef6b5..c4792fb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pgadmin4-9.17.tar.gz) = 6b43a180daad6a1e4bcb993063dd2fd3d07cf47c525b8c55487b14f9caf48585ec22db76fa657acc965795d7973a05c0dd0adeb4fa348b42c7c3cf297b085e2e
-SHA512 (pgadmin4-9.17-vendor.tar.xz) = 4dfbef76e4f64cf2b5edcb5e5044ddb5ac72b483e93c202401627ae777f980a1a34bc575dd43c153218d6b486cccefd581db7d2a4c5fb4634cd828744c42e25a
+SHA512 (pgadmin4-9.18.tar.gz) = fa0a98870399a46f048abe512a149fae2e263d01aa70d0e8d756eddf6dc31750deaf2323ba5a0158851d6d2afdcb43602b6fc196acb0f2d22c211829575179d9
+SHA512 (pgadmin4-9.18-vendor.tar.xz) = cbf24bd75844af676d81599f09e9223aa9408ed3ed1c569cf94efdf9358b2cd3737e88c11e65c14263c7ba416325fa2d6b56191b8fca995fa81f6d5eceaa1905
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-18 19:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-18 19:04 [rpms/pgadmin4] f43: Update to 9.18 Sandro Mani
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox