diff --git a/.github/workflows/cross_build.yml b/.github/workflows/cross_build.yml index c2103a1e..0863729d 100644 --- a/.github/workflows/cross_build.yml +++ b/.github/workflows/cross_build.yml @@ -3,7 +3,7 @@ name: cross-build on: push: branches: - - improve-and-fix-workflow + - embedded-lib-cross-build # pull_request: # types: [closed] # branches: @@ -18,7 +18,7 @@ jobs: run: "echo 'Waiting for other workflow to complete...'" build: - if: github.event.pull_request.merged == true +# if: github.event.pull_request.merged == true name: Build C release for ${{ matrix.os.name }} strategy: matrix: diff --git a/.gitignore b/.gitignore index 293663e7..aaa72bf8 100644 --- a/.gitignore +++ b/.gitignore @@ -74,7 +74,7 @@ Cargo.lock *.egg-info/ *.egg .eggs/ -*.so +#*.so /build/ # ----------------------------------- # server tests diff --git a/MANIFEST.in b/MANIFEST.in index 3c666bc3..83c39617 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,4 @@ recursive-include surrealdb *.so -recursive-include surrealdb *.txt \ No newline at end of file +recursive-include surrealdb *.dll +recursive-include surrealdb *.dylib +recursive-include surrealdb *.txt diff --git a/libsrc/libsurrealdb_c.so b/libsrc/libsurrealdb_c.so new file mode 100755 index 00000000..86f7296b Binary files /dev/null and b/libsrc/libsurrealdb_c.so differ diff --git a/libsrc/surrealdb_c.dll b/libsrc/surrealdb_c.dll new file mode 100755 index 00000000..73dc3811 Binary files /dev/null and b/libsrc/surrealdb_c.dll differ diff --git a/setup.py b/setup.py index 53bde2d5..e31bc0aa 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,6 @@ import pathlib from setuptools import setup -from setuptools_rust import Binding, RustExtension with open("README.md", "r") as fh: @@ -14,18 +13,18 @@ setup( - name="surrealdb-beta", - author="Maxwell Flitton", + name="surrealdb", + author="SurrealDB", author_email="maxwell@gmail.com", description="SurrealDB python client.", long_description=long_description, long_description_content_type="text/markdown", version=version, - rust_extensions=[RustExtension("surrealdb.rust_surrealdb", binding=Binding.PyO3)], + # package_dir={"surrealdb": "surrealdb"}, packages=[ "surrealdb", - "surrealdb.execution_mixins", - "surrealdb.async_execution_mixins" + "surrealdb.data", + "surrealdb.data.types", ], package_data={ "surrealdb": ["binaries/*"], diff --git a/surrealdb/VERSION.txt b/surrealdb/VERSION.txt index b217dcd1..1b71c507 100644 --- a/surrealdb/VERSION.txt +++ b/surrealdb/VERSION.txt @@ -1 +1 @@ -VERSION='0.1.0' \ No newline at end of file +VERSION='0.4.3' \ No newline at end of file diff --git a/surrealdb/connection_clib.py b/surrealdb/connection_clib.py index f2ce6960..5b3b54de 100644 --- a/surrealdb/connection_clib.py +++ b/surrealdb/connection_clib.py @@ -10,15 +10,15 @@ def get_lib_path() -> str: if platform.system() == "Linux": - lib_extension = ".so" + lib_file = "libsurrealdb_c.so" elif platform.system() == "Darwin": - lib_extension = ".dylib" + lib_file = "libsurrealdb_c.dylib" elif platform.system() == "Windows": - lib_extension = ".dll" + lib_file = "surrealdb_c.dll" else: raise SurrealDbConnectionError("Unsupported operating system") - lib_path = os.path.join(CLIB_FOLDER_PATH, f"libsurrealdb_c{lib_extension}") + lib_path = os.path.join(CLIB_FOLDER_PATH, f"{lib_file}") if os.path.isfile(lib_path) is not True: raise Exception(f"{lib_path} is missing")