Merge pull request #1333 from mabel-dev/0.12.0b123

0.12.0b123

.github/workflows/build_counter.yaml

@@ -20,7 +20,7 @@ jobs:
       id: check_changes
       run: |
         changes=$(git diff --name-only)
-        if [[ "$changes" == *"__build.py__"* ]]; then
+        if [[ "$changes" == *"__version__.py"* ]]; then
           echo "::set-output name=changes::0"
         else
           echo "::set-output name=changes::1"
@@ -32,6 +32,6 @@ jobs:
         python $GITHUB_WORKSPACE/build_counter.py
         git config --global user.name "XB500"
         git config --global user.email "[email protected]"
-        git add $GITHUB_WORKSPACE/opteryx/__build__.py
+        git add $GITHUB_WORKSPACE/opteryx/__version__.py
         git commit -m "Update Build Number to $GITHUB_RUN_NUMBER"
         git push

build_counter.py

@@ -6,8 +6,12 @@
 if build_number:
     build_numnber = int(build_number)
 
+    with open("opteryx/__version__.py", "r") as f:
+        contents = f.read().splitlines()[1:]
+
     # Save the build number to the build.py file
-    with open("opteryx/__build__.py", "w") as f:
+    with open("opteryx/__version__.py", "w") as f:
         f.write(f"__build__ = {build_number}\n")
+        f.write("\n".join(contents))
 
     print(f"Build Number: {build_number}")

opteryx/__version__.py

@@ -1,3 +1,4 @@
+__build__ = 127
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,12 +16,7 @@
 1) we don't load dependencies by storing it in __init__.py
 2) we can import it in setup.py for the same reason
 """
-from enum import Enum
-
-__build__ = "notset"
-with open(f"__build__.py", mode="r") as v:
-    build = v.read()
-exec(build)  # nosec
+from enum import Enum  # isort: skip
 
 
 class VersionStatus(Enum):
@@ -36,4 +32,4 @@ class VersionStatus(Enum):
 
 __version__ = f"{_major}.{_minor}.{_revision}" + (
     f"-{_status.value}.{__build__}" if _status != VersionStatus.RELEASE else ""
-)
+)

setup.py

@@ -27,11 +27,6 @@ def rust_build(setup_kwargs: Dict[str, Any]) -> None:
     vers = v.read()
 exec(vers)  # nosec
 
-__build__ = "notset"
-with open(f"{LIBRARY}/__build__.py", mode="r") as v:
-    build = v.read()
-exec(build)  # nosec
-
 __author__ = "notset"
 with open(f"{LIBRARY}/__author__.py", mode="r") as v:
     author = v.read()