From 03e14e0f95af3140a12be28b9bd009dc0f8bb0d8 Mon Sep 17 00:00:00 2001 From: Forrest Collman Date: Tue, 18 Mar 2025 08:10:49 -0700 Subject: [PATCH 1/5] trying to upgrade base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c26ffdc1b..bfb8fe348 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # FROM gcr.io/neuromancer-seung-import/pychunkedgraph:graph-tool_dracopy -FROM seunglab/pychunkedgraph:graph-tool_dracopy +FROM caveconnectome/pychunkedgraph:base_042124 COPY override/timeout.conf /etc/nginx/conf.d/timeout.conf COPY override/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY requirements.txt /app From d3e6bf9868cb01c84b3a7699af3ee33442f78955 Mon Sep 17 00:00:00 2001 From: Forrest Collman Date: Tue, 18 Mar 2025 14:18:48 -0700 Subject: [PATCH 2/5] change datastore pin --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 67e12a697..90dc08273 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ numpy pandas networkx==2.1 google-cloud-bigtable>=0.33.0 -google-cloud-datastore>=1.8<=2.0dev +google-cloud-datastore>=1.8<=2.18.0 flask_cors codecov multiwrapper From 98d04b6fa7605bd1adeb0432560dd2db3ded53d6 Mon Sep 17 00:00:00 2001 From: Forrest Collman Date: Tue, 18 Mar 2025 14:24:50 -0700 Subject: [PATCH 3/5] fix req to comma --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 90dc08273..9660b9d38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ numpy pandas networkx==2.1 google-cloud-bigtable>=0.33.0 -google-cloud-datastore>=1.8<=2.18.0 +google-cloud-datastore>=1.8,<=2.18.0 flask_cors codecov multiwrapper From 994a4ccaffa0f52bffb3393b5ed7d859c05f456f Mon Sep 17 00:00:00 2001 From: Forrest Collman Date: Tue, 18 Mar 2025 14:30:56 -0700 Subject: [PATCH 4/5] trying to bump dracopy --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9660b9d38..1ef6f0c59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ zstandard redis rq middle-auth-client>=3.11.0 -dracopy~=1.0.0 +dracopy==1.3.0 zmesh fastremap contact-points From a358a2f1bedd0d5a6787db7b465d3b9e74720e03 Mon Sep 17 00:00:00 2001 From: Forrest Collman Date: Tue, 18 Mar 2025 14:34:48 -0700 Subject: [PATCH 5/5] switching to pinning packaging --- Dockerfile | 5 +++-- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bfb8fe348..11e6f6432 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,5 +4,6 @@ COPY override/timeout.conf /etc/nginx/conf.d/timeout.conf COPY override/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY requirements.txt /app RUN pip install --upgrade pip \ - && pip install --no-cache-dir --upgrade -r requirements.txt -COPY . /app \ No newline at end of file + && pip install packaging==21.3 \ + && pip install --no-cache-dir --upgrade -r requirements.txt +COPY . /app \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 1ef6f0c59..9660b9d38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ zstandard redis rq middle-auth-client>=3.11.0 -dracopy==1.3.0 +dracopy~=1.0.0 zmesh fastremap contact-points