Skip to content

Commit 0c2ae2c

Browse files
authored
chore: Updated to latest changes in c-questdb-client. (#10)
1 parent 17ed815 commit 0c2ae2c

File tree

4 files changed

+11
-46
lines changed

4 files changed

+11
-46
lines changed

.github/workflows/build_wheels.yml.txt

Lines changed: 0 additions & 35 deletions
This file was deleted.

proj.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def sdist():
126126
def clean():
127127
_rmtree(PROJ_ROOT / 'build')
128128
_rmtree(PROJ_ROOT / 'dist')
129-
_rmtree(PROJ_ROOT / 'c-questdb-client' / 'target')
129+
_rmtree(PROJ_ROOT / 'c-questdb-client' / 'questdb-rs-ffi' / 'target')
130130
_rmtree(PROJ_ROOT / 'c-questdb-client' / 'build')
131131
_rmtree(PROJ_ROOT / 'src' / 'questdb.egg-info')
132132
_rmtree(PROJ_ROOT / 'venv')

setup.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ def ingress_extension():
2929
extra_link_args = []
3030
extra_objects = []
3131

32+
questdb_rs_ffi_dir = PROJ_ROOT / 'c-questdb-client' / 'questdb-rs-ffi'
3233
questdb_client_lib_dir = None
3334
if PLATFORM == 'win32' and MODE == '32bit':
34-
questdb_client_lib_dir = (PROJ_ROOT /
35-
'c-questdb-client' / 'target' / WIN_32BIT_CARGO_TARGET / 'release')
35+
questdb_client_lib_dir = \
36+
questdb_rs_ffi_dir / 'target' / WIN_32BIT_CARGO_TARGET / 'release'
3637
else:
37-
questdb_client_lib_dir = (PROJ_ROOT /
38-
'c-questdb-client' / 'target' / 'release')
38+
questdb_client_lib_dir = questdb_rs_ffi_dir / 'target' / 'release'
3939

4040
if PLATFORM == 'darwin':
4141
lib_name = 'libquestdb_client.a'
@@ -63,7 +63,7 @@ def ingress_extension():
6363

6464

6565
def cargo_build():
66-
if not (PROJ_ROOT / 'c-questdb-client' / 'src').exists():
66+
if not (PROJ_ROOT / 'c-questdb-client' / 'questdb-rs-ffi').exists():
6767
if os.environ.get('SETUP_DO_GIT_SUBMODULE_INIT') == '1':
6868
subprocess.check_call([
6969
'git', 'submodule', 'update', '--init', '--recursive'])
@@ -93,14 +93,14 @@ def cargo_build():
9393
cargo_args = [
9494
'cargo',
9595
'build',
96-
'--release',
97-
'--features',
98-
'ffi']
96+
'--release']
9997

10098
if PLATFORM == 'win32' and MODE == '32bit':
10199
cargo_args.append(f'--target={WIN_32BIT_CARGO_TARGET}')
102100

103-
subprocess.check_call(cargo_args, cwd=str(PROJ_ROOT / 'c-questdb-client'))
101+
subprocess.check_call(
102+
cargo_args,
103+
cwd=str(PROJ_ROOT / 'c-questdb-client' / 'questdb-rs-ffi'))
104104

105105

106106
class questdb_build_ext(build_ext):

0 commit comments

Comments
 (0)