Merge pull request #2890 from mabel-dev/0.26.0-release

0.26.0-release

Author: joocer

dev/build_counter.py

@@ -1,28 +1,39 @@
+"""
+Build counter script to increment build number on each build.
+
+We update the __version__ module and the version in pyproject.toml to keep them in sync.
+"""
+
 import re
 import subprocess
 from pathlib import Path
 
 from enum import Enum  # isort: skip
 
 class VersionStatus(Enum):
+    """
+    Enumeration for version status.
+    """
     ALPHA = "alpha"
     BETA = "beta"
     RELEASE = "release"
 
 __major_version__ = 0
 __minor_version__ = 26
-__revision_version__ = 0
+__revision_version__ = 1
 __author__ = "@joocer"
 __status__ = VersionStatus.BETA
 
 __build__ = None
-with open("opteryx/__version__.py", mode="r") as v:
+with open("opteryx/__version__.py", mode="r", encoding="utf-8") as v:
     vers = v.read()
 exec(vers)  # nosec
 
 if __build__:
     __build__ = int(__build__) + 1
-    __version__ = f"{__major_version__}.{__minor_version__}.{__revision_version__}" + f"-{__status__.value}.{__build__}" if __status__ != VersionStatus.RELEASE else ""
+    __version__ = f"{__major_version__}.{__minor_version__}.{__revision_version__}"
+    if __status__ != VersionStatus.RELEASE:
+        __version__ += f"-{__status__.value}.{__build__}"
 
     VERSION_FILE_CONTENT = f"""# THIS FILE IS AUTOMATICALLY UPDATED DURING THE BUILD PROCESS
 # DO NOT EDIT THIS FILE DIRECTLY
@@ -48,14 +59,14 @@ class VersionStatus(Enum):
 print(__version__)
 
 pyproject_path = Path("pyproject.toml")
-pyproject_contents = pyproject_path.read_text()
+pyproject_contents = pyproject_path.read_text(encoding="utf-8")
 pattern = re.compile(r'^(version\s*=\s*")[^"]*(")', re.MULTILINE)
 updated_contents, replacements = pattern.subn(f'version = "{__version__}"', pyproject_contents, count=1)
 
 if replacements == 0:
     msg = "Unable to locate version field in pyproject.toml"
     raise ValueError(msg)
 
-pyproject_path.write_text(updated_contents)
+pyproject_path.write_text(updated_contents, encoding="utf-8")
 
 subprocess.run(["git", "add", "opteryx/__version__.py", "pyproject.toml"])

opteryx/__version__.py

@@ -1,9 +1,9 @@
 # THIS FILE IS AUTOMATICALLY UPDATED DURING THE BUILD PROCESS
 # DO NOT EDIT THIS FILE DIRECTLY
 
-__build__ = 1724
+__build__ = 1726
 __author__ = "@joocer"
-__version__ = "0.26.0-beta.1724"
+__version__ = "0.26.1-beta.1726"
 
 # Store the version here so:
 # 1) we don't load dependencies by storing it in __init__.py

opteryx/config.py

@@ -126,11 +126,11 @@ def line_value(value: str) -> typing.Any:
 try:  # pragma: no cover
     _config_path = Path(".") / "opteryx.yaml"
     if _config_path.exists():
-        with open(_config_path, "r") as _config_file:
+        with open(_config_path, "r", encoding="utf-8") as _config_file:
             _config_values = parse_yaml(_config_file.read())
         if _OPTERYX_DEBUG:
             print(f"{datetime.datetime.now()} [LOADER] Loading config from {_config_path}")
-except Exception as exception:  # pragma: no cover # it doesn't matter why - just use the defaults
+except OSError as exception:  # pragma: no cover # it doesn't matter why - just use the defaults
     if _OPTERYX_DEBUG:
         print(
             f"{datetime.datetime.now()} [LOADER] Config file {_config_path} not used - {exception}"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opteryx"
-version = "0.26.0-beta.1724"
+version = "0.26.1-beta.1726"
 description = "Query your data, where it lives"
 requires-python = '>=3.11'
 readme = {file = "README.md", content-type = "text/markdown"}

tests/performance/clickbench/clickbench.py

@@ -167,9 +167,9 @@ def test_sql_battery(statement:str, exception: Optional[Exception]):
                     iter_strs.append("-")
 
                 status = ""
-                if avg_time > 5000:
+                if min_time > 5000:
                     status = " ⚠️ VERY SLOW"
-                elif avg_time > 2000:
+                elif min_time > 2000:
                     status = " ⚠️ SLOW"
 
                 print(f"{query_num:<8} {iter_strs[0]:<16} {iter_strs[1]:<16} {iter_strs[2]:<16} "

tests/unit/planner/test_predicate_compaction.py

@@ -216,5 +216,5 @@ def test_predicate_compaction_contradiction_inside_subquery():
 
 if __name__ == "__main__":  # pragma: no cover
     from tests import run_tests
-    test_predicate_compaction_keeps_equality_with_additional_filters()
-    #run_tests()
+    
+    run_tests()