Revert "Revert "TEST - Build and image with new Flask and SQLAlchemy" (#974)"

This reverts commit e47ca86.

reverting my old revert...  ugh, sorry, ive made a mess of this repository :(

this restores the rest of the version bumps we updated previously

Author: melange396

devops/Dockerfile

@@ -3,13 +3,16 @@ WORKDIR /src
 COPY . /src
 RUN npm ci && npm run build
 
-FROM tiangolo/meinheld-gunicorn:python3.7
+FROM tiangolo/meinheld-gunicorn:python3.8
 LABEL org.opencontainers.image.source=https://github.com/cmu-delphi/delphi-epidata
 # use delphi's timezome
 RUN ln -s -f /usr/share/zoneinfo/America/New_York /etc/localtime
 
-COPY requirements.txt /app
-RUN pip install --no-cache-dir -r requirements.txt
+COPY requirements.txt /app/requirements_also.txt
+RUN pip install --no-cache-dir -r /tmp/requirements.txt -r requirements_also.txt
+# the file /tmp/requirements.txt is created in the parent docker definition.  (see:
+#   https://github.com/tiangolo/meinheld-gunicorn-docker/blob/master/docker-images/python3.8.dockerfile#L5 )
+# this combined requirements installation ensures all version constrants are accounted for.
 
 # disable python stdout buffering
 ENV PYTHONUNBUFFERED 1

src/server/_query.py

@@ -14,7 +14,7 @@
 )
 
 from sqlalchemy import text
-from sqlalchemy.engine import RowProxy
+from sqlalchemy.engine import Row
 
 from ._common import db, app
 from ._db import metadata
@@ -197,7 +197,7 @@ def filter_pair(pair: TimePair, i) -> str:
 
 
 def parse_row(
-    row: RowProxy,
+    row: Row,
     fields_string: Optional[Sequence[str]] = None,
     fields_int: Optional[Sequence[str]] = None,
     fields_float: Optional[Sequence[str]] = None,
@@ -245,7 +245,7 @@ def run_query(p: APrinter, query_tuple: Tuple[str, Dict[str, Any]]):
     return db.execution_options(stream_results=True).execute(full_query, **params)
 
 
-def _identity_transform(row: Dict[str, Any], _: RowProxy) -> Dict[str, Any]:
+def _identity_transform(row: Dict[str, Any], _: Row) -> Dict[str, Any]:
     """
     identity transform
     """
@@ -257,7 +257,7 @@ def execute_queries(
     fields_string: Sequence[str],
     fields_int: Sequence[str],
     fields_float: Sequence[str],
-    transform: Callable[[Dict[str, Any], RowProxy], Dict[str, Any]] = _identity_transform,
+    transform: Callable[[Dict[str, Any], Row], Dict[str, Any]] = _identity_transform,
 ):
     """
     execute the given queries and return the response to send them
@@ -317,7 +317,7 @@ def execute_query(
     fields_string: Sequence[str],
     fields_int: Sequence[str],
     fields_float: Sequence[str],
-    transform: Callable[[Dict[str, Any], RowProxy], Dict[str, Any]] = _identity_transform,
+    transform: Callable[[Dict[str, Any], Row], Dict[str, Any]] = _identity_transform,
 ):
     """
     execute the given query and return the response to send it