Bump turbodbc to 4.7.0 (#70)

deephaven · Nov 9, 2023 · ece6d74 · ece6d74
1 parent fab5071
commit ece6d74
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/contexts/server-base/requirements.txt b/contexts/server-base/requirements.txt
@@ -25,7 +25,8 @@ adbc-driver-manager
 adbc-driver-postgresql
 
 # optional turbodbc feature
-turbodbc
+# We are adding the arrow/numpy extra requirements to make sure pip installs compatible versions
+turbodbc[arrow,numpy]==4.7.0
 
 # optional connectorx feature for x86_64 arch only, no Linux/arm64 wheel yet
 connectorx; platform.machine == 'x86_64'
diff --git a/contexts/turbodbc-wheel/Dockerfile b/contexts/turbodbc-wheel/Dockerfile
@@ -20,12 +20,10 @@ RUN \
     set -eux; \
     pip install --only-binary=:all: -r requirements.txt
 
-# CFLAGS is still needed to work around https://github.com/blue-yonder/turbodbc/issues/384
 # Ensure requirements.txt is updated whenever turbodbc version bumped
 RUN \
     set -eux; \
-    CFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" \
-    pip wheel --no-cache-dir -w /wheels-tmp turbodbc==4.6.0
+    pip wheel --no-cache-dir -w /wheels-tmp turbodbc==4.7.0
 
 RUN \
     --mount=type=bind,source=auditwheel-keep-pyarrow.py,target=auditwheel-keep-pyarrow.py \

diff --git a/contexts/turbodbc-wheel/auditwheel-keep-pyarrow.py b/contexts/turbodbc-wheel/auditwheel-keep-pyarrow.py
@@ -5,7 +5,7 @@
 
 for policy in _POLICIES:
   policy['lib_whitelist'].append('libarrow_python.so')
-  policy['lib_whitelist'].append('libarrow.so.1200')
+  policy['lib_whitelist'].append('libarrow.so.1300')
 
 if __name__ == '__main__':
   sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])

diff --git a/contexts/turbodbc-wheel/requirements.txt b/contexts/turbodbc-wheel/requirements.txt
@@ -10,5 +10,5 @@ numpy>=1.20
 pybind11>=2.10.4
 
 # hack to ensure turbodbc builds pyarrow bindings
-# auditwheel-keep-pyarrow.py is targeting pyarrow 12
-pyarrow==12.0.0
+# auditwheel-keep-pyarrow.py is targeting pyarrow 13
+pyarrow==13.0.0