Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove turbodbc build #98

Merged
merged 1 commit into from
Jun 17, 2024
+1 −75
Merged

Remove turbodbc build #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions contexts/server-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@jmao-denver jmao-denver Jun 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strictly we don't need these packages, but we want to keep them in case we need to do manual testing of turbodbc. Maybe a comment to make it clear?

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} \
Expand All @@ -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; \
Expand Down
4 changes: 0 additions & 4 deletions contexts/server-base/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
39 changes: 0 additions & 39 deletions contexts/turbodbc-wheel/Dockerfile
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions contexts/turbodbc-wheel/requirements.txt
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions server-base.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" : "",
]
}

# -------------------------------------