From 508a4cb42325e0038d77a4f12dfe193446e8fb51 Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Wed, 29 Sep 2021 12:37:04 -0700
Subject: [PATCH] Remove libpq-dev as requirement for standard install (#1442)

---
 Dockerfile       | 2 +-
 README.md        | 3 +--
 requirements.txt | 1 -
 setup.py         | 5 ++++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ed4be0db..ce87be2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ COPY squeaknode ./squeaknode
 COPY proto ./proto
 COPY LICENSE MANIFEST.in README.md requirements.txt setup.cfg setup.py  ./
 
-RUN python3 setup.py install
+RUN pip install .[postgres]
 
 FROM python:3.8-slim-buster
 
diff --git a/README.md b/README.md
index dc4686af..838dce84 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@ Node for [Squeak protocol](https://github.com/yzernik/squeak/blob/master/docs/PR
 * a bitcoin node
 * an LND node
 * Python 3.6 or later
-* libpq-dev (`sudo apt install libpq-dev` on ubuntu)
 
 #### Optional
 * a Tor SOCKS5 proxy (you can open Tor Browser and run it in the background)
@@ -43,7 +42,7 @@ Node for [Squeak protocol](https://github.com/yzernik/squeak/blob/master/docs/PR
 	$ virtualenv venv
 	$ source venv/bin/activate
 	$ pip install -r requirements.txt
-	$ python setup.py install
+	$ pip install .
 	```
 - Start squeaknode:
  	```
diff --git a/requirements.txt b/requirements.txt
index 5370c7b8..e815c6b2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,6 @@ grpcio-tools==1.39.0
 importlib_resources==1.4.0
 mypy-protobuf==2.9
 protobuf==3.17.3
-psycopg2==2.9.1
 PySocks==1.7.1
 python-bitcoinlib==0.11.0
 pyzmq==22.3.0
diff --git a/setup.py b/setup.py
index cc570e15..7f9b3fea 100644
--- a/setup.py
+++ b/setup.py
@@ -97,7 +97,10 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
-    extras_require={"test": ["pytest", "coverage"]},
+    extras_require={
+        "test": ["pytest", "coverage"],
+        "postgres": ["psycopg2"],
+    },
     entry_points={
         'console_scripts': [
             'squeaknode = squeaknode.main:main',