From a27af0841033f91fabc721e2cfbb400e16f281ce Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 25 Jul 2018 22:31:39 -0400 Subject: [PATCH] Add psycopg2 to optional dependencies (ref #195) --- optional-requirements.txt | 1 + setup.py | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/optional-requirements.txt b/optional-requirements.txt index a4400877..d55db3e8 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -2,3 +2,4 @@ lxml cryptg Pillow moviepy +psycopg2-binary diff --git a/setup.py b/setup.py index 05276bb5..8c08dadb 100644 --- a/setup.py +++ b/setup.py @@ -2,14 +2,17 @@ import setuptools import glob import mautrix_telegram -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())) +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)) setuptools.setup( name="mautrix-telegram", @@ -60,4 +63,3 @@ setuptools.setup( ("alembic/versions", glob.glob("alembic/versions/*.py")) ], ) -