IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Depend on psycopg2-binary in the Python wheel, rather than psycopg2. Fixes #4165

Browse Source
This commit is contained in:
Dave Page 2019-04-11 10:08:44 +01:00
parent a9d964b5ca
commit ded446fe8a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_6.rst
View File

@ -10,6 +10,7 @@ release of pgAdmin4 4.5
Features Features
******** ********
| `Feature #4165 <https://redmine.postgresql.org/issues/4165>`_ - Depend on psycopg2-binary in the Python wheel, rather than psycopg2.
Bug fixes Bug fixes
********* *********

5
pkg/pip/setup_pip.py
View File

@ -37,6 +37,11 @@ with open(req_file, 'r') as reqf:
for index, req in enumerate(required): for index, req in enumerate(required):
if ";" in req or req.startswith("#") or req == "": if ";" in req or req.startswith("#") or req == "":
required.remove(req) required.remove(req)
continue
# Ensure the Wheel will use psycopg2-binary, not the source distro
if 'psycopg2' in req:
required[index] = req.replace('psycopg2', 'psycopg2-binary')
# Get the app version # Get the app version
if sys.version_info[:2] >= (3, 3): if sys.version_info[:2] >= (3, 3):