Merge pull request #1583 from p-l-/fix-elastic-tmp

DB/elastic: lock elasticsearch < 8.9.0

ivre/tools/version.py

@@ -42,9 +42,12 @@ def get_version(module: str) -> Optional[str]:
         return None
     for attr in ["__version__", "VERSION", "version"]:
         try:
-            return str(getattr(mod, attr))
+            data = getattr(mod, attr)
         except AttributeError:
-            pass
+            continue
+        if isinstance(data, tuple):
+            return ".".join(str(value) for value in data)
+        return str(data)
     return "[unknown version]"
 
 
@@ -95,6 +98,8 @@ def main() -> None:
         "pymongo",
         "sqlalchemy",
         "tinydb",
+        "elasticsearch",
+        "elasticsearch_dsl",
     ]:
         version = get_version(module)
         if version is None:

requirements-all.txt

@@ -4,7 +4,7 @@ bottle
 codespell
 cryptography
 docutils!=0.18
-elasticsearch
+elasticsearch<8
 elasticsearch-dsl
 flake8
 mypy

requirements-elastic.txt

@@ -1,4 +1,4 @@
-elasticsearch
+elasticsearch<8
 elasticsearch-dsl
 cryptography
 pyOpenSSL>=16.1.0

setup.py

@@ -171,7 +171,7 @@ def _write_pkg_file(self, file):
         "MongoDB mongo+srv URIs": ["pymongo[srv]"],
         "TinyDB (experimental)": ["tinydb"],
         "PostgreSQL (experimental)": ["sqlalchemy", "psycopg2"],
-        "Elasticsearch (experimental)": ["elasticsearch", "elasticsearch-dsl"],
+        "Elasticsearch (experimental)": ["elasticsearch<8", "elasticsearch-dsl"],
         "GSSAPI authentication for MongoDB": ["python-krbV"],
         "GSSAPI authentication for HTTP": ["pycurl"],
         "Screenshots": ["PIL"],