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

Add dependency on jpy>=0.15.0 #5022

Merged
merged 2 commits into from
Jan 10, 2024
Merged

Add dependency on jpy>=0.15.0 #5022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ff5648
Bump base images, pickup jpy>=0.15.0
devinrsmith Jan 10, 2024
dcb17e4
Merge remote-tracking branch 'upstream/main' into bump-to-jpy-0.15.0
devinrsmith Jan 10, 2024
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
2 changes: 1 addition & 1 deletion docker/registry/server-base/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
io.deephaven.project.ProjectType=DOCKER_REGISTRY
deephaven.registry.imageName=ghcr.io/deephaven/server-base:edge
deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:8f9b993a4ce7c78b50b869be840241a0a9d19d3f4f35601f20cd05475abd5753
deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:005bb15db3be4cc3b106dac86574a593c96e989d338f9e618e83b5f282050ae2
12 changes: 6 additions & 6 deletions docker/server-jetty/src/main/server-jetty/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
adbc-driver-manager==0.8.0
adbc-driver-postgresql==0.8.0
adbc-driver-manager==0.9.0
adbc-driver-postgresql==0.9.0
connectorx==0.3.2; platform.machine == 'x86_64'
deephaven-plugin==0.6.0
java-utilities==0.2.0
jedi==0.18.2
jpy==0.14.0
jpy==0.15.0
llvmlite==0.41.1
numba==0.58.1
numpy==1.26.2
numpy==1.26.3
pandas==2.1.4
parso==0.8.3
pyarrow==14.0.1
pyarrow==14.0.2
python-dateutil==2.8.2
pytz==2023.3.post1
six==1.16.0
turbodbc==4.8.0
tzdata==2023.3
tzdata==2023.4
12 changes: 6 additions & 6 deletions docker/server/src/main/server-netty/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
adbc-driver-manager==0.8.0
adbc-driver-postgresql==0.8.0
adbc-driver-manager==0.9.0
adbc-driver-postgresql==0.9.0
connectorx==0.3.2; platform.machine == 'x86_64'
deephaven-plugin==0.6.0
java-utilities==0.2.0
jedi==0.18.2
jpy==0.14.0
jpy==0.15.0
llvmlite==0.41.1
numba==0.58.1
numpy==1.26.2
numpy==1.26.3
pandas==2.1.4
parso==0.8.3
pyarrow==14.0.1
pyarrow==14.0.2
python-dateutil==2.8.2
pytz==2023.3.post1
six==1.16.0
turbodbc==4.8.0
tzdata==2023.3
tzdata==2023.4
3 changes: 2 additions & 1 deletion py/server/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ def _compute_version():
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
],
keywords='Deephaven Development',
python_requires='>=3.8',
install_requires=[
'jpy>=0.14.0',
'jpy>=0.15.0',
'deephaven-plugin>=0.6.0',
'numpy',
'pandas>=1.5.0',
Expand Down
Loading