From e289376f45addef06dbb9f6fa5d17da4222999bd Mon Sep 17 00:00:00 2001 From: joocer <justin.joyce@joocer.com> Date: Wed, 13 Dec 2023 16:51:24 +0000 Subject: [PATCH 1/4] 0.12.0 --- build_counter.py | 6 +++++- opteryx/__build__.py | 1 - opteryx/__version__.py | 7 +------ 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 opteryx/__build__.py diff --git a/build_counter.py b/build_counter.py index ac2fdd997..30cfa0785 100644 --- a/build_counter.py +++ b/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}") diff --git a/opteryx/__build__.py b/opteryx/__build__.py deleted file mode 100644 index 084730d15..000000000 --- a/opteryx/__build__.py +++ /dev/null @@ -1 +0,0 @@ -__build__ = 119 diff --git a/opteryx/__version__.py b/opteryx/__version__.py index 809a3c8b0..75663bbf1 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -1,3 +1,4 @@ +__build__ = "notset" # 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 @@ -17,12 +18,6 @@ """ from enum import Enum -__build__ = "notset" -with open(f"__build__.py", mode="r") as v: - build = v.read() -exec(build) # nosec - - class VersionStatus(Enum): ALPHA = "alpha" BETA = "beta" From 82aea0f5bb9d7a603229c83815364f90d1f6887c Mon Sep 17 00:00:00 2001 From: joocer <justin.joyce@joocer.com> Date: Wed, 13 Dec 2023 16:54:32 +0000 Subject: [PATCH 2/4] 0.12.0 --- opteryx/__version__.py | 3 ++- setup.py | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/opteryx/__version__.py b/opteryx/__version__.py index 75663bbf1..698460150 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -16,7 +16,8 @@ 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 +from enum import Enum # isort: skip + class VersionStatus(Enum): ALPHA = "alpha" diff --git a/setup.py b/setup.py index f86c49e9a..833e23a5f 100644 --- a/setup.py +++ b/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() From ecae20e11f14e29fd0bb2ef4ff1af9fd05f246bd Mon Sep 17 00:00:00 2001 From: joocer <justin.joyce@joocer.com> Date: Wed, 13 Dec 2023 16:56:27 +0000 Subject: [PATCH 3/4] 0.12.0 --- .github/workflows/build_counter.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_counter.yaml b/.github/workflows/build_counter.yaml index f842dde13..27dd3de5a 100644 --- a/.github/workflows/build_counter.yaml +++ b/.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 "XB500@users.noreply.github.com" - 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 From 88ee50e89752ca2978f4d94bc8646da7d68876cb Mon Sep 17 00:00:00 2001 From: XB500 <XB500@users.noreply.github.com> Date: Wed, 13 Dec 2023 16:56:51 +0000 Subject: [PATCH 4/4] Update Build Number to 127 --- opteryx/__version__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opteryx/__version__.py b/opteryx/__version__.py index 698460150..c408cd406 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -1,4 +1,4 @@ -__build__ = "notset" +__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 @@ -32,4 +32,4 @@ class VersionStatus(Enum): __version__ = f"{_major}.{_minor}.{_revision}" + ( f"-{_status.value}.{__build__}" if _status != VersionStatus.RELEASE else "" -) +) \ No newline at end of file