From 6b012193e3519458ef4eb7926a73ff93af202ea6 Mon Sep 17 00:00:00 2001 From: Khushboo Vashi Date: Wed, 10 Jul 2024 17:43:13 +0530 Subject: [PATCH] Pin Psycopg Binary packages to 3.1.19 for the ARM64 MacOS platform wheel packages. --- pkg/pip/setup_pip.py | 9 ++++++++- web/pgadmin/misc/__init__.py | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py index c65795b10..6c37ec754 100644 --- a/pkg/pip/setup_pip.py +++ b/pkg/pip/setup_pip.py @@ -10,6 +10,7 @@ import builtins import os import sys +import platform from codecs import open from importlib.machinery import SourceFileLoader @@ -40,7 +41,13 @@ kerberos_extras = [] # gssapi in it's own list for index, req in enumerate(all_requires): if 'psycopg[c]' in req: - req = req.replace('psycopg[c]', 'psycopg[binary]') + # Starting from Psycopg 3.1.20, ARM64 macOS binary packages are no + # longer available for macOS versions before 14.0. + if platform.system() == 'Darwin' and 'arm' in platform.processor()\ + and platform.mac_ver()[0] < '14.0': + req = 'psycopg[binary]==3.1.19' + else: + req.replace('psycopg[c]', 'psycopg[binary]') if 'gssapi' in req: kerberos_extras.append(req) diff --git a/web/pgadmin/misc/__init__.py b/web/pgadmin/misc/__init__.py index 7c194ad9e..a9466bafa 100644 --- a/web/pgadmin/misc/__init__.py +++ b/web/pgadmin/misc/__init__.py @@ -228,7 +228,6 @@ def validate_binary_path(): running the utilities with their versions. """ data = None - return precondition_required(gettext('Invalid binary path.')) if hasattr(request.data, 'decode'): data = request.data.decode('utf-8')