Merge pull request #2097 from mabel-dev/#2061/6

#2061/6

opteryx/__main__.py

@@ -23,13 +23,14 @@
 import threading
 import time
 
-import opteryx
-from opteryx.exceptions import MissingSqlStatement
-from opteryx.utils.sql import clean_statement
-from opteryx.utils.sql import remove_comments
-
 sys.path.insert(1, os.path.join(sys.path[0], ".."))
 
+if True:
+    import opteryx
+    from opteryx.exceptions import MissingSqlStatement
+    from opteryx.utils.sql import clean_statement
+    from opteryx.utils.sql import remove_comments
+
 
 if readline:
     pass

opteryx/__version__.py

@@ -1,4 +1,4 @@
-__build__ = 858
+__build__ = 862
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

tests/misc/test_cli.py

@@ -6,8 +6,11 @@
 
 def run_cli(args):
     """Helper function to run the CLI and return the result."""
+    from tests.tools import find_file
+
+    path = find_file("**/__main__.py")
     result = subprocess.run(
-        [sys.executable, "opteryx/__main__.py"] + args,
+        [sys.executable, path] + args,
         capture_output=True,
         text=True,
         timeout=5

tests/tools.py

@@ -47,6 +47,7 @@ def test_example():
 
 import platform
 from functools import wraps
+from typing import Optional
 
 
 def is_arm():  # pragma: no cover
@@ -179,6 +180,13 @@ def wrapper(*args, **kwargs):
     return decorate
 
 
+def find_file(path: str) -> Optional[str]:
+    import glob
+
+    matches = glob.iglob(path)
+    return next(matches, None)
+
+
 def download_file(url: str, path: str):  # pragma: no cover
     """
     Download a file from a given URL and save it to a specified path.