From 492ce3309a88e6fea361c20b0f06ec70d2411939 Mon Sep 17 00:00:00 2001 From: youben11 Date: Mon, 3 Jan 2022 11:25:28 +0100 Subject: [PATCH] chore(python): change version file we don't want the version file to be included in the package to not clash with version files of other subpackages, as it should be part of the bigger concrete namespace package --- compiler/Makefile | 2 +- compiler/lib/Bindings/Python/CMakeLists.txt | 1 - compiler/lib/Bindings/Python/concrete/version.py | 4 ---- compiler/lib/Bindings/Python/version.txt | 1 + compiler/setup.py | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 compiler/lib/Bindings/Python/concrete/version.py create mode 100644 compiler/lib/Bindings/Python/version.txt diff --git a/compiler/Makefile b/compiler/Makefile index 7435472f1..3bc5115db 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -161,7 +161,7 @@ release_tarballs: docker container run --rm -v ${PWD}/../tarballs:/tarballs_volume concretefhe-compiler-manylinux:linux_x86_64_tarball cp -r /tarballs/. /tarballs_volume/. update_python_version: - echo "__version__ = \"`git describe --tags --abbrev=0 | grep -e '[0-9].*' -o`\"" > lib/Bindings/Python/concrete/version.py + echo "__version__ = \"`git describe --tags --abbrev=0 | grep -e '[0-9].*' -o`\"" > lib/Bindings/Python/version.txt .PHONY: build-initialized \ build-end-to-end-jit \ diff --git a/compiler/lib/Bindings/Python/CMakeLists.txt b/compiler/lib/Bindings/Python/CMakeLists.txt index 8999e2bd8..3d75a5089 100644 --- a/compiler/lib/Bindings/Python/CMakeLists.txt +++ b/compiler/lib/Bindings/Python/CMakeLists.txt @@ -27,7 +27,6 @@ declare_mlir_python_sources(ConcretelangBindingsPythonSources ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}" SOURCES concrete/compiler.py - concrete/version.py concrete/__init__.py concrete/lang/__init__.py concrete/lang/dialects/__init__.py diff --git a/compiler/lib/Bindings/Python/concrete/version.py b/compiler/lib/Bindings/Python/concrete/version.py deleted file mode 100644 index bfc7b96ab..000000000 --- a/compiler/lib/Bindings/Python/concrete/version.py +++ /dev/null @@ -1,4 +0,0 @@ -# Part of the Concrete Compiler Project, under the BSD3 License with Zama Exceptions. -# See https://github.com/zama-ai/homomorphizer/blob/master/LICENSE.txt for license information. - -__version__ = "0.1.0-rc1" diff --git a/compiler/lib/Bindings/Python/version.txt b/compiler/lib/Bindings/Python/version.txt new file mode 100644 index 000000000..7d1de2290 --- /dev/null +++ b/compiler/lib/Bindings/Python/version.txt @@ -0,0 +1 @@ +__version__ = "0.1.0-rc1" \ No newline at end of file diff --git a/compiler/setup.py b/compiler/setup.py index 31486c298..f26fa1fa4 100644 --- a/compiler/setup.py +++ b/compiler/setup.py @@ -14,7 +14,7 @@ def read(fname): def find_version(): return re.match( r"__version__ = \"(?P.+)\"", - read("lib/Bindings/Python/concrete/version.py"), + read("lib/Bindings/Python/version.txt"), ).group("version")