From 85dc80bfa7c4692bdd05eb3062259c4af0154864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 20 Feb 2020 13:18:10 +0100 Subject: [PATCH] setup.py: Remove the e2e_search feature. The e2e_search feature depends on tantivy. The tantivy package got a release on pypi in the meantime but the API changed in incompatible ways. Remove support for it so someone doesn't shoot himself in the foot. --- README.md | 16 ---------------- pantalaimon/index.py | 2 +- setup.py | 3 --- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/README.md b/README.md index 02e70bd..17b6cc6 100644 --- a/README.md +++ b/README.md @@ -93,22 +93,6 @@ UseKeyring = False IgnoreVerification = True ``` -### Experimental E2E search support. - -Pantalaimon can handle the search endpoint of a Matrix server as well, providing -search support for E2E encrypted rooms. - -For this to work [tantivy](https://github.com/tantivy-search/tantivy) is needed. -Tantivy is a full text search engine written in rust. - -The python bindings for tantivy are needed for pantalaimon. The bindings are not -yet merged upstream, instead they can be found -[here](https://github.com/matrix-org/tantivy/tree/topcollector_order_by/python). - -Note that rust nightly (tested version was: 1.36.0-nightly (50a0defd5 2019-05-21)) -and [setuptools-rust](https://pypi.org/project/setuptools-rust/) are required -before the tantivy python bindings can be installed. - Usage ===== diff --git a/pantalaimon/index.py b/pantalaimon/index.py index 8192d00..0f10044 100644 --- a/pantalaimon/index.py +++ b/pantalaimon/index.py @@ -19,7 +19,7 @@ class InvalidQueryError(Exception): pass -if util.find_spec("tantivy"): +if False: import asyncio import datetime import json diff --git a/setup.py b/setup.py index adf0cc7..b2b29f7 100644 --- a/setup.py +++ b/setup.py @@ -32,9 +32,6 @@ setup( "matrix-nio[e2e] >= 0.4.1" ], extras_require={ - "e2e_search": [ - "tantivy", - ], "ui": [ "dbus-python", "PyGObject",