bumps python version in huey dockerfile; removes unused PyNaCl dependency; Better handling of content types on StoryMap imports

scott2b · scott2b · commit 49cbc515e0ee · 2025-06-04T15:15:41.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+localstack-data/
+
 dist/*
 .pgdata/
 
diff --git a/Dockerfile.huey b/Dockerfile.huey
@@ -1,4 +1,4 @@
-FROM python:3.8.2
+FROM python:3.10.2
 ENV PYTHONUNBUFFERED=1
 COPY ./requirements-dev.txt /usr/src/apps/StoryMapJS/
 #COPY ./.localstack/KnightLabRootCA.crt /usr/src/apps/StoryMapJS/
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,3 @@
-version: '3.9'
-
-
-volumes:
-  localstack-data:
-    external: true
-
-
 services:
 
   app:
@@ -48,7 +40,7 @@ services:
       # - LOCALSTACK_DATA_DIR=/localstack/data
     volumes:
       #- ./.localstack/:/var/lib/localstack
-      - localstack-data:/var/lib/localstack
+      - ./localstack-data:/var/lib/localstack
       #- ./.localstack/:/localstack
       #- "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -32,7 +32,6 @@ psycopg2-binary==2.8.5
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
 pycparser==2.14
-PyNaCl==1.3.0
 pyOpenSSL==20.0.1
 python-slugify==1.1.2
 requests==2.24.0
diff --git a/storymap/storage.py b/storymap/storage.py
@@ -4,6 +4,7 @@
 Object Keys
 http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html
 """
+import mimetypes
 import os
 import sys
 import time
@@ -197,6 +198,11 @@ def save_from_data(key_name, content_type, content):
     """
     Save content with content-type to key_name
     """
+    if content_type is None:
+        content_type, _ = mimetypes.guess_type(key_name)
+    if content_type is None:
+        content_type = 'application/octet-stream'
+
     _conn.put_object(
         ACL='public-read',
         Body=content,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+localstack-data/`
	`2`	`+`
`1`	`3`	`dist/*`
`2`	`4`	`.pgdata/`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.8.2`
	`1`	`+FROM python:3.10.2`
`2`	`2`	`ENV PYTHONUNBUFFERED=1`
`3`	`3`	`COPY ./requirements-dev.txt /usr/src/apps/StoryMapJS/`
`4`	`4`	`#COPY ./.localstack/KnightLabRootCA.crt /usr/src/apps/StoryMapJS/`