From 2a43e9a8f36902ced35c30bedb76f66ac398a968 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Tue, 28 May 2024 18:31:27 +0000 Subject: [PATCH 1/4] unpinn --- tests/utils/kagglehub.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/utils/kagglehub.py b/tests/utils/kagglehub.py index bfe7b417..a6250e29 100644 --- a/tests/utils/kagglehub.py +++ b/tests/utils/kagglehub.py @@ -26,14 +26,10 @@ def do_GET(self): path = m.group(2) filepath = f"/input/tests/data/kagglehub/models/{model_handle}/{path}" if not os.path.isfile(filepath): - raise ValueError(( - "Internet is disabled in our tests\n" - "kagglehub uses a fake API server\n" - f"Use `kagglehub.model_download('{model_handle}', path='{path}')` to download the missing file\n" - f"and copy it to `./docker-python/tests/data/kagglehub/models/{model_handle}/{path}`\n" - )) + self.send_response(404) + self.end_headers() return - + with open(filepath, "rb") as f: self.send_response(200) self.send_header("Content-type", "application/octet-stream") From 4d42af7e28899fd25012600e659155433a8a68ad Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Tue, 28 May 2024 18:37:49 +0000 Subject: [PATCH 2/4] unpinnn --- Dockerfile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index 240de659..275750c4 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -224,7 +224,7 @@ ADD patches/keras_internal_test.py /opt/conda/lib/python3.10/site-packages/tenso # We ignore dependencies since tf2.15 and Keras 3.* should work despite pip saying it won't. # Currently, keras tries to install a nightly version of tf 2.16: https://github.com/keras-team/keras/blob/fe2f54aa5bc42fb23a96449cf90434ab9bb6a2cd/requirements.txt#L2 # b/341360061 Unpin keras-nlp once kaggle-hub is able to provide task.json file when requested -RUN pip install --no-deps "keras>3" keras-cv "keras-nlp==0.9.3" namex && \ +RUN pip install --no-deps "keras>3" keras-cv keras-nlp namex && \ /tmp/clean-layer.sh # b/328788268 libpysal 4.10 seems to fail with "module 'shapely' has no attribute 'Geometry'. Did you mean: 'geometry'" From ed0ca3e78854504cb03478bc9e4533e382fa7778 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Tue, 28 May 2024 20:38:38 +0000 Subject: [PATCH 3/4] unpinnnn --- tests/utils/kagglehub.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/utils/kagglehub.py b/tests/utils/kagglehub.py index a6250e29..126672ad 100644 --- a/tests/utils/kagglehub.py +++ b/tests/utils/kagglehub.py @@ -26,8 +26,10 @@ def do_GET(self): path = m.group(2) filepath = f"/input/tests/data/kagglehub/models/{model_handle}/{path}" if not os.path.isfile(filepath): - self.send_response(404) - self.end_headers() + self.send_error(404, "Internet is disabled in our tests " + "kagglehub uses a fake API server " + f"Use `kagglehub.model_download('{model_handle}', path='{path}')` to download the missing file " + f"and copy it to `./docker-python/tests/data/kagglehub/models/{model_handle}/{path}`.") return with open(filepath, "rb") as f: From 76ec4d8230fcea152032df53273a7597554e2558 Mon Sep 17 00:00:00 2001 From: Jonathan Calderon Chavez Date: Tue, 28 May 2024 20:53:30 +0000 Subject: [PATCH 4/4] unpinnnnn --- tests/utils/kagglehub.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/kagglehub.py b/tests/utils/kagglehub.py index 126672ad..d7819dde 100644 --- a/tests/utils/kagglehub.py +++ b/tests/utils/kagglehub.py @@ -27,7 +27,7 @@ def do_GET(self): filepath = f"/input/tests/data/kagglehub/models/{model_handle}/{path}" if not os.path.isfile(filepath): self.send_error(404, "Internet is disabled in our tests " - "kagglehub uses a fake API server " + "kagglehub uses a fake API server. " f"Use `kagglehub.model_download('{model_handle}', path='{path}')` to download the missing file " f"and copy it to `./docker-python/tests/data/kagglehub/models/{model_handle}/{path}`.") return