From 61a7b16bb633c10f597e4f126ac2d36e0de6c7a2 Mon Sep 17 00:00:00 2001 From: Evgeny Novikov Date: Thu, 13 Jan 2022 12:28:34 +0300 Subject: [PATCH] Use psycopg2-binary rather than psycopg2 In addition, elimanate unnecessary dependency (development package for PostgreSQL). This helps to avoid issues on some new disctibutions like openSUSE 15.3 that misses the pg_config utility necessary to install psycopg2 from sources (https://github.com/psycopg/psycopg2/issues/1001). Probably there will be some performance degradation, but it is not crucial for our use cases. --- klever/deploys/conf/debian-packages.txt | 2 +- klever/deploys/conf/fedora-packages.txt | 2 +- klever/deploys/conf/opensuse-packages.txt | 2 +- requirements-openstack.txt | 2 +- requirements.txt | 2 +- setup.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/klever/deploys/conf/debian-packages.txt b/klever/deploys/conf/debian-packages.txt index dc9c62189..89de7197a 100644 --- a/klever/deploys/conf/debian-packages.txt +++ b/klever/deploys/conf/debian-packages.txt @@ -1 +1 @@ -bc bison cmake flex gettext git graphviz libc6-dev-i386 libelf-dev libpq-dev libssl-dev make nginx postgresql python3-dev python3-pip rabbitmq-server unzip +bc bison cmake flex gettext git graphviz libc6-dev-i386 libelf-dev libssl-dev make nginx postgresql python3-dev python3-pip rabbitmq-server unzip diff --git a/klever/deploys/conf/fedora-packages.txt b/klever/deploys/conf/fedora-packages.txt index 25b4ae0da..f52fedcc7 100644 --- a/klever/deploys/conf/fedora-packages.txt +++ b/klever/deploys/conf/fedora-packages.txt @@ -1 +1 @@ -bc bison cmake elfutils-libelf-devel flex gettext git glibc-devel.i686 graphviz libpq-devel make nginx openssl-devel postgresql postgresql-server python3-devel python3-pip rabbitmq-server unzip +bc bison cmake elfutils-libelf-devel flex gettext git glibc-devel.i686 graphviz make nginx openssl-devel postgresql postgresql-server python3-devel python3-pip rabbitmq-server unzip diff --git a/klever/deploys/conf/opensuse-packages.txt b/klever/deploys/conf/opensuse-packages.txt index 73be9f4f8..88dfa8bc9 100644 --- a/klever/deploys/conf/opensuse-packages.txt +++ b/klever/deploys/conf/opensuse-packages.txt @@ -1 +1 @@ -bc bison cmake flex gettext-runtime git graphviz glibc-devel libelf-devel openssl-devel make nginx postgresql12-server postgresql12-server-devel python3-devel python3-pip rabbitmq-server unzip gcc gcc-c++ +bc bison cmake flex gettext-runtime git graphviz glibc-devel libelf-devel openssl-devel make nginx postgresql12-server python3-devel python3-pip rabbitmq-server unzip gcc gcc-c++ diff --git a/requirements-openstack.txt b/requirements-openstack.txt index bf1734399..d8ef22032 100644 --- a/requirements-openstack.txt +++ b/requirements-openstack.txt @@ -64,7 +64,7 @@ pika==1.1.0 ply==3.11 prettytable==0.7.2 prompt-toolkit==3.0.8 -psycopg2==2.8.6 +psycopg2-binary==2.8.6 pycparser==2.20 pycryptodome==3.9.9 Pygments==2.7.3 diff --git a/requirements.txt b/requirements.txt index c378c53f7..64defc5d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,7 +29,7 @@ MarkupSafe==1.1.1 pika==1.1.0 ply==3.11 prompt-toolkit==3.0.8 -psycopg2==2.8.6 +psycopg2-binary==2.8.6 Pygments==2.7.3 python-slugify==4.0.1 pytz==2020.4 diff --git a/setup.py b/setup.py index b735444fd..39490cf6d 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ def package_files(package_directory): "Django==3.0.6", "BenchExec==3.3", "clade>=3.4,<3.5", - "psycopg2", + "psycopg2-binary", "graphviz", "celery", "django_celery_results",