From 83a9de164ec2fba4fbf24d0bb8dfc23aa5cebecc Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 25 Jul 2018 22:44:33 -0400
Subject: [PATCH] Revert "Add psycopg2 to optional dependencies (ref #195)"

This reverts commit a27af0841033f91fabc721e2cfbb400e16f281ce.
---
 optional-requirements.txt |  1 -
 setup.py                  | 20 +++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index d55db3e8..a4400877 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -2,4 +2,3 @@ lxml
 cryptg
 Pillow
 moviepy
-psycopg2-binary
diff --git a/setup.py b/setup.py
index 8c08dadb..05276bb5 100644
--- a/setup.py
+++ b/setup.py
@@ -2,17 +2,14 @@ import setuptools
 import glob
 import mautrix_telegram
 
-extras = dict(
-    highlight_edits=["lxml>=4.1.1,<5"],
-    better_formatter=["lxml>=4.1.1,<5"],
-    fast_crypto=["cryptg>=0.1,<0.2"],
-    webp_convert=["Pillow>=5.0.0,<6"],
-    hq_thumbnails=["moviepy>=0.2,<0.3"],
-    postgres=["psycopg2-binary>=2,<3"],
-)
-extras["all"] = list(set(dep
-                         for deps in extras.values()
-                         for dep in deps))
+extras = {
+    "highlight_edits": ["lxml>=4.1.1,<5"],
+    "better_formatter": ["lxml>=4.1.1,<5"],
+    "fast_crypto": ["cryptg>=0.1,<0.2"],
+    "webp_convert": ["Pillow>=5.0.0,<6"],
+    "hq_thumbnails": ["moviepy>=0.2,<0.3"],
+}
+extras["all"] = list(set(deps[0] for deps in extras.values()))
 
 setuptools.setup(
     name="mautrix-telegram",
@@ -63,3 +60,4 @@ setuptools.setup(
         ("alembic/versions", glob.glob("alembic/versions/*.py"))
     ],
 )
+