Bump base images to jpy 0.13.0 (#3069)

deephaven · Nov 14, 2022 · 14ce63d · 14ce63d
1 parent 79f635d
commit 14ce63d
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 42 deletions.
diff --git a/docker/registry/all-ai-base/gradle.properties b/docker/registry/all-ai-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/all-ai-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/all-ai-base@sha256:a070ef4c1eb67e8e98b000376b608181546f482f6779899689c73b7b85953236
+deephaven.registry.imageId=ghcr.io/deephaven/all-ai-base@sha256:0df3f8cda97ee78703d139ae44983837f2a3316aeea5d414826efbd7ccc452f0
diff --git a/docker/registry/go/gradle.properties b/docker/registry/go/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=golang:1
-deephaven.registry.imageId=golang@sha256:7ffa70183b7596e6bc1b78c132dbba9a6e05a26cd30eaa9832fecad64b83f029
+deephaven.registry.imageId=golang@sha256:bf4b15c14a715b9c2d278809254268d57dd74bbee69489e781e9303c814160d5
diff --git a/docker/registry/nltk-base/gradle.properties b/docker/registry/nltk-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/nltk-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/nltk-base@sha256:67b4af2839a63abaae716b92b2528f7724f04486754d1dff6a07e7978722805b
+deephaven.registry.imageId=ghcr.io/deephaven/nltk-base@sha256:1df4fda4a1f25be302c9d71149b3cf8b42551829ec0c5af43e1a164cce3c2ee9
diff --git a/docker/registry/node/gradle.properties b/docker/registry/node/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=node:14
-deephaven.registry.imageId=node@sha256:768de2ed03a469f086aeb737196d559427a7b313afa363597e6ef0e337a17855
+deephaven.registry.imageId=node@sha256:1172bd6da670f35dca9b2f43eb27c1444c6b3350f7b9619e6a9fdef6cff88d47
diff --git a/docker/registry/protoc-base/gradle.properties b/docker/registry/protoc-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/protoc-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:687961c6656e01ff53d7cd10951c05923309dea82d4fa060d2e61d38916a7559
+deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:565f80c57d4234440cae075a6e434f492d23acae57228787ee9c68641af08552
diff --git a/docker/registry/pytorch-base/gradle.properties b/docker/registry/pytorch-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/pytorch-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/pytorch-base@sha256:508976aab94ca7caf4127b85c8c544d2bf0309f4745947a3d39a9cc7d3ed9973
+deephaven.registry.imageId=ghcr.io/deephaven/pytorch-base@sha256:60ca5835d227832a3a0e8938a9c24ed43072713a7dc0e864b3dca6f1bdbbcade
diff --git a/docker/registry/scripts/update-requirements.sh b/docker/registry/scripts/update-requirements.sh
@@ -29,4 +29,5 @@ docker run --rm "${nltk_base_image_id}" pip freeze | grep -v "pkg.resources" > "
 docker run --rm "${pytorch_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-pytorch-netty/requirements.txt"
 docker run --rm "${sklearn_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-sklearn-netty/requirements.txt"
 docker run --rm "${tensorflow_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-tensorflow-netty/requirements.txt"
-docker run --rm "${all_ai_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-all-ai-netty/requirements.txt"
+docker run --rm "${all_ai_base_image_id}" pip freeze | grep -v "pkg.resources" > "${__dir}/../../server/src/main/server-all-ai-netty/requirements.txt"
+
diff --git a/docker/registry/server-base/gradle.properties b/docker/registry/server-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/server-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:1ccd5e383e1bda596ff8d039d25478023534678774025b3624ff233710dbea92
+deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:0684e7e9a2961e8f7b9a964011451206775961d1fc257d4fe8700983d0a7efd2
diff --git a/docker/registry/sklearn-base/gradle.properties b/docker/registry/sklearn-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/sklearn-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/sklearn-base@sha256:602c2986518b258a9ec5009165cdf71c230151fa3750643bed8b824f6a9f3065
+deephaven.registry.imageId=ghcr.io/deephaven/sklearn-base@sha256:721efedc30a28c6ff3da6ea0148a02bbe16e748f684be8de782e147700bfda5b
diff --git a/docker/registry/tensorflow-base/gradle.properties b/docker/registry/tensorflow-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/tensorflow-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/tensorflow-base@sha256:226c0f69370f58a14dca5483439e9dba939ceea14fd1339b687a1922a2795f2f
+deephaven.registry.imageId=ghcr.io/deephaven/tensorflow-base@sha256:febafa37c70b569d5485cb042f538ad1adbeb0fd107c5e2c288f1903ae022961
diff --git a/docker/server-jetty/src/main/server-jetty/requirements.txt b/docker/server-jetty/src/main/server-jetty/requirements.txt
@@ -1,13 +1,13 @@
 deephaven-plugin==0.3.0
 importlib-metadata==5.0.0
 java-utilities==0.2.0
-jpy==0.12.0
+jpy==0.13.0
 llvmlite==0.39.1
-numba==0.56.3
+numba==0.56.4
 numpy==1.21.6
 pandas==1.3.5
 python-dateutil==2.8.2
-pytz==2022.5
+pytz==2022.6
 six==1.16.0
 typing_extensions==4.4.0
 zipp==3.10.0
diff --git a/docker/server/src/main/server-all-ai-netty/requirements.txt b/docker/server/src/main/server-all-ai-netty/requirements.txt
@@ -7,7 +7,7 @@ click==8.1.3
 deephaven-plugin==0.3.0
 flatbuffers==2.0.7
 gast==0.4.0
-google-auth==2.13.0
+google-auth==2.14.0
 google-auth-oauthlib==0.4.6
 google-pasta==0.2.0
 grpcio==1.50.0
@@ -16,25 +16,29 @@ idna==3.4
 importlib-metadata==5.0.0
 java-utilities==0.2.0
 joblib==1.2.0
-jpy==0.12.0
+jpy==0.13.0
 keras==2.7.0
 Keras-Preprocessing==1.1.2
 libclang==14.0.6
 llvmlite==0.39.1
 Markdown==3.4.1
 MarkupSafe==2.1.1
 nltk==3.7
-numba==0.56.3
+numba==0.56.4
 numpy==1.21.6
+nvidia-cublas-cu11==11.10.3.66
+nvidia-cuda-nvrtc-cu11==11.7.99
+nvidia-cuda-runtime-cu11==11.7.99
+nvidia-cudnn-cu11==8.5.0.96
 oauthlib==3.2.2
 opt-einsum==3.3.0
 pandas==1.3.5
 protobuf==3.19.6
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 python-dateutil==2.8.2
-pytz==2022.5
-regex==2022.9.13
+pytz==2022.6
+regex==2022.10.31
 requests==2.28.1
 requests-oauthlib==1.3.1
 rsa==4.9
@@ -47,9 +51,9 @@ tensorboard-plugin-wit==1.8.1
 tensorflow==2.7.4
 tensorflow-estimator==2.7.0
 tensorflow-io-gcs-filesystem==0.27.0
-termcolor==2.0.1
+termcolor==2.1.0
 threadpoolctl==3.1.0
-torch==1.12.1
+torch==1.13.0
 tqdm==4.64.1
 typing_extensions==4.4.0
 urllib3==1.26.12

diff --git a/docker/server/src/main/server-netty/requirements.txt b/docker/server/src/main/server-netty/requirements.txt
@@ -1,13 +1,13 @@
 deephaven-plugin==0.3.0
 importlib-metadata==5.0.0
 java-utilities==0.2.0
-jpy==0.12.0
+jpy==0.13.0
 llvmlite==0.39.1
-numba==0.56.3
+numba==0.56.4
 numpy==1.21.6
 pandas==1.3.5
 python-dateutil==2.8.2
-pytz==2022.5
+pytz==2022.6
 six==1.16.0
 typing_extensions==4.4.0
 zipp==3.10.0
diff --git a/docker/server/src/main/server-nltk-netty/requirements.txt b/docker/server/src/main/server-nltk-netty/requirements.txt
@@ -3,15 +3,15 @@ deephaven-plugin==0.3.0
 importlib-metadata==5.0.0
 java-utilities==0.2.0
 joblib==1.2.0
-jpy==0.12.0
+jpy==0.13.0
 llvmlite==0.39.1
 nltk==3.6.7
-numba==0.56.3
+numba==0.56.4
 numpy==1.21.6
 pandas==1.3.5
 python-dateutil==2.8.2
-pytz==2022.5
-regex==2022.9.13
+pytz==2022.6
+regex==2022.10.31
 six==1.16.0
 tqdm==4.64.1
 typing_extensions==4.4.0

diff --git a/docker/server/src/main/server-pytorch-netty/requirements.txt b/docker/server/src/main/server-pytorch-netty/requirements.txt
@@ -3,25 +3,25 @@ cachetools==5.2.0
 certifi==2022.9.24
 charset-normalizer==2.1.1
 deephaven-plugin==0.3.0
-google-auth==2.13.0
+google-auth==2.14.0
 google-auth-oauthlib==0.4.6
 grpcio==1.50.0
 idna==3.4
 importlib-metadata==5.0.0
 java-utilities==0.2.0
-jpy==0.12.0
+jpy==0.13.0
 llvmlite==0.39.1
 Markdown==3.4.1
 MarkupSafe==2.1.1
-numba==0.56.3
+numba==0.56.4
 numpy==1.21.6
 oauthlib==3.2.2
 pandas==1.3.5
 protobuf==3.19.6
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 python-dateutil==2.8.2
-pytz==2022.5
+pytz==2022.6
 requests==2.28.1
 requests-oauthlib==1.3.1
 rsa==4.9

diff --git a/docker/server/src/main/server-sklearn-netty/requirements.txt b/docker/server/src/main/server-sklearn-netty/requirements.txt
@@ -2,13 +2,13 @@ deephaven-plugin==0.3.0
 importlib-metadata==5.0.0
 java-utilities==0.2.0
 joblib==1.2.0
-jpy==0.12.0
+jpy==0.13.0
 llvmlite==0.39.1
-numba==0.56.3
+numba==0.56.4
 numpy==1.21.6
 pandas==1.3.5
 python-dateutil==2.8.2
-pytz==2022.5
+pytz==2022.6
 scikit-learn==0.24.2
 scipy==1.7.3
 six==1.16.0

diff --git a/docker/server/src/main/server-tensorflow-netty/requirements.txt b/docker/server/src/main/server-tensorflow-netty/requirements.txt
@@ -6,22 +6,22 @@ charset-normalizer==2.1.1
 deephaven-plugin==0.3.0
 flatbuffers==2.0.7
 gast==0.4.0
-google-auth==2.13.0
+google-auth==2.14.0
 google-auth-oauthlib==0.4.6
 google-pasta==0.2.0
 grpcio==1.50.0
 h5py==3.7.0
 idna==3.4
 importlib-metadata==5.0.0
 java-utilities==0.2.0
-jpy==0.12.0
+jpy==0.13.0
 keras==2.7.0
 Keras-Preprocessing==1.1.2
 libclang==14.0.6
 llvmlite==0.39.1
 Markdown==3.4.1
 MarkupSafe==2.1.1
-numba==0.56.3
+numba==0.56.4
 numpy==1.21.6
 oauthlib==3.2.2
 opt-einsum==3.3.0
@@ -30,7 +30,7 @@ protobuf==3.19.6
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 python-dateutil==2.8.2
-pytz==2022.5
+pytz==2022.6
 requests==2.28.1
 requests-oauthlib==1.3.1
 rsa==4.9
@@ -41,7 +41,7 @@ tensorboard-plugin-wit==1.8.1
 tensorflow==2.7.4
 tensorflow-estimator==2.7.0
 tensorflow-io-gcs-filesystem==0.27.0
-termcolor==2.0.1
+termcolor==2.1.0
 typing_extensions==4.4.0
 urllib3==1.26.12
 Werkzeug==2.2.2

diff --git a/py/embedded-server/setup.py b/py/embedded-server/setup.py
@@ -53,7 +53,7 @@ def normalize_version(version):
     keywords='Deephaven Development',
     python_requires='>=3.7',
     install_requires=[
-        'jpy>=0.12.0',
+        'jpy>=0.13.0',
         "java-utilities",
         f"deephaven-core=={__normalized_version__}",
     ]

diff --git a/py/jpy-ext/build.gradle b/py/jpy-ext/build.gradle
@@ -16,6 +16,6 @@ plugins {
 }
 
 dependencies {
-  api 'org.jpyconsortium:jpy:0.12.0'
+  api 'org.jpyconsortium:jpy:0.13.0'
   api project(':deephaven-jpy-config')
 }
diff --git a/py/server/setup.py b/py/server/setup.py
@@ -52,7 +52,7 @@ def normalize_version(version):
     keywords='Deephaven Development',
     python_requires='>=3.7',
     install_requires=[
-        'jpy>=0.12.0',
+        'jpy>=0.13.0',
         'deephaven-plugin',
         'numpy',
         'pandas',