Remove turbodbc build

This is removing turbodbc, as we are not able to get the latest version to build (see deephaven#97). This effects our ability to test the latest version of numpy. See deephaven#71 for related concerns generally about option dependencies and the restrictions they place on server-base.
devinrsmith · Jun 17, 2024 · 4efdb04 · 4efdb04
1 parent 6abafac
commit 4efdb04
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 75 deletions.
diff --git a/contexts/server-base/Dockerfile b/contexts/server-base/Dockerfile
@@ -71,7 +71,7 @@ ARG TARGETARCH
 ARG UBUNTU_VERSION
 
 # curl is necessary for some kafka integration testing
-# unixodbc, odbc-postgresql for postgres  / turbodbc integration testing
+# unixodbc, odbc-postgresql for postgres integration testing
 RUN \
     --mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
     --mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
@@ -87,7 +87,6 @@ ARG REQUIREMENTS_TYPE
 RUN \
     --mount=type=bind,source=requirements.txt,target=requirements.txt \
     --mount=type=bind,source=type/${REQUIREMENTS_TYPE}/requirements.txt,target=requirements-2.txt \
-    --mount=type=bind,from=turbodbc-wheel,source=/wheels,target=/wheels \
     --mount=type=cache,target=/root/.cache/pip,sharing=locked \
     set -eux; \
     mkdir -p /opt/deephaven; \

diff --git a/contexts/server-base/requirements.txt b/contexts/server-base/requirements.txt
@@ -24,9 +24,5 @@ jedi==0.18.2
 adbc-driver-manager
 adbc-driver-postgresql
 
-# optional turbodbc feature
-# We are adding the arrow/numpy extra requirements to make sure pip installs compatible versions
-turbodbc[arrow,numpy]==4.8.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
diff --git a/contexts/turbodbc-wheel/requirements.txt b/contexts/turbodbc-wheel/requirements.txt
diff --git a/server-base.hcl b/server-base.hcl
@@ -137,9 +137,6 @@ target "server-base-tensorflow" {
 
 target "server-base-context" {
     context = "contexts/server-base/"
-    contexts = {
-        turbodbc-wheel = "target:turbodbc-wheel"
-    }
     args = {
         OPENJDK_VERSION = OPENJDK_VERSION
         PYTHON_VERSION = PYTHON_VERSION
@@ -162,16 +159,3 @@ target "server-base-context" {
 }
 
 # -------------------------------------
-
-target "turbodbc-wheel" {
-    context = "contexts/turbodbc-wheel/"
-    args = {
-        PYTHON_VERSION = PYTHON_VERSION
-    }
-    platforms = [
-        MULTI_ARCH || RELEASE ? "linux/amd64" : "",
-        MULTI_ARCH || RELEASE ? "linux/arm64" : "",
-    ]
-}
-
-# -------------------------------------