Merge pull request #53 from spectriclabs/dev

Dev -> Master

Author: desean1625

Diff for: Dockerfile

@@ -23,7 +23,7 @@ COPY --from=builder /build/dist/*.whl /home/datashader/tmp/
 ENV PATH="$PATH:/home/datashader/.local/bin"
 RUN pip install --upgrade pip && \
     pip install --no-cache-dir /home/datashader/tmp/*.whl && \
-    pip install gunicorn==20.1.0 && \
+    pip install gunicorn==22.0.0 && \
     pip install uvicorn==0.24.0
 
 COPY deployment/logging_config.yml /opt/elastic_datashader/

Diff for: elastic_datashader/config.py

@@ -94,7 +94,7 @@ def config_from_env(env) -> Config:
         datashader_headers=load_datashader_headers(env.get("DATASHADER_HEADER_FILE", "headers.yaml")),
         elastic_hosts=env.get("DATASHADER_ELASTIC", "http://localhost:9200"),
         ellipse_render_mode=env.get("DATASHADER_ELLIPSE_RENDER_MODE", "matrix"),
-        ellipse_render_min_zoom=env.get("DATASHADER_ELLIPSE_RENDER_MIN_ZOOM", 8),
+        ellipse_render_min_zoom=int(env.get("DATASHADER_ELLIPSE_RENDER_MIN_ZOOM", 8)),
         hostname=getfqdn(),
         log_level=get_log_level(env.get("DATASHADER_LOG_LEVEL", None)),
         max_batch=int(env.get("DATASHADER_MAX_BATCH", 10_000)),

Diff for: pyproject.toml

@@ -39,7 +39,7 @@ humanize = "*"
 uvicorn = {extras = ["standard"], version = "0.24.0", optional = true}
 fastapi = ">=0.109.1"
 georgio = "2023.156.924"
-jinja2 = "3.1.2"
+jinja2 = "3.1.4"
 
 [tool.poetry.dev-dependencies]
 pytest = "*"