Skip to content

Commit 4efdb04

Browse files
committed
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.
1 parent 6abafac commit 4efdb04

File tree

5 files changed

+1
-75
lines changed

5 files changed

+1
-75
lines changed

contexts/server-base/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ARG TARGETARCH
7171
ARG UBUNTU_VERSION
7272

7373
# curl is necessary for some kafka integration testing
74-
# unixodbc, odbc-postgresql for postgres / turbodbc integration testing
74+
# unixodbc, odbc-postgresql for postgres integration testing
7575
RUN \
7676
--mount=type=cache,target=/var/cache/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
7777
--mount=type=cache,target=/var/lib/apt,sharing=locked,id=apt-${TARGETARCH}-${UBUNTU_VERSION} \
@@ -87,7 +87,6 @@ ARG REQUIREMENTS_TYPE
8787
RUN \
8888
--mount=type=bind,source=requirements.txt,target=requirements.txt \
8989
--mount=type=bind,source=type/${REQUIREMENTS_TYPE}/requirements.txt,target=requirements-2.txt \
90-
--mount=type=bind,from=turbodbc-wheel,source=/wheels,target=/wheels \
9190
--mount=type=cache,target=/root/.cache/pip,sharing=locked \
9291
set -eux; \
9392
mkdir -p /opt/deephaven; \

contexts/server-base/requirements.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,5 @@ jedi==0.18.2
2424
adbc-driver-manager
2525
adbc-driver-postgresql
2626

27-
# optional turbodbc feature
28-
# We are adding the arrow/numpy extra requirements to make sure pip installs compatible versions
29-
turbodbc[arrow,numpy]==4.8.0
30-
3127
# optional connectorx feature for x86_64 arch only, no Linux/arm64 wheel yet
3228
connectorx; platform.machine == 'x86_64'

contexts/turbodbc-wheel/Dockerfile

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

contexts/turbodbc-wheel/requirements.txt

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

server-base.hcl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ target "server-base-tensorflow" {
137137

138138
target "server-base-context" {
139139
context = "contexts/server-base/"
140-
contexts = {
141-
turbodbc-wheel = "target:turbodbc-wheel"
142-
}
143140
args = {
144141
OPENJDK_VERSION = OPENJDK_VERSION
145142
PYTHON_VERSION = PYTHON_VERSION
@@ -162,16 +159,3 @@ target "server-base-context" {
162159
}
163160

164161
# -------------------------------------
165-
166-
target "turbodbc-wheel" {
167-
context = "contexts/turbodbc-wheel/"
168-
args = {
169-
PYTHON_VERSION = PYTHON_VERSION
170-
}
171-
platforms = [
172-
MULTI_ARCH || RELEASE ? "linux/amd64" : "",
173-
MULTI_ARCH || RELEASE ? "linux/arm64" : "",
174-
]
175-
}
176-
177-
# -------------------------------------

0 commit comments

Comments
 (0)