Merge pull request #43 from yanokwa/pyxform-2-fix

Update to pyxform 2.0.0, Flask 3.0.0
getodk · Dec 6, 2023 · 96f6da0 · 96f6da0
2 parents fcea408 + d5ce23c
commit 96f6da0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ FLASK_APP=app/main.py:app FLASK_DEBUG=1 flask run
 # Run in Docker
 ```
 docker build --tag pyxform-http .
-docker run --detach --publish 5000:80 pyxform-http
+docker run --detach --publish 5001:80 pyxform-http
 ```
 
 # Test forms
@@ -23,4 +23,8 @@ docker run --detach --publish 5000:80 pyxform-http
 bash test.sh
 ```
 
-The test script builds, runs, stops, and removes a pyxform-http-tester container
+The test script builds, runs, stops, and removes a pyxform-http-tester container
+
+# Notes
+
+* We use port 5001 because 5000 is used by ControlCenter on macOS. 
diff --git a/app/main.py b/app/main.py
@@ -4,7 +4,8 @@
 from tempfile import TemporaryDirectory
 import os.path
 
-from flask import Flask, jsonify, request, escape
+from flask import Flask, jsonify, request
+from markupsafe import escape
 from pyxform import xls2xform
 from uuid import uuid4 as uuid
 from urllib.parse import unquote

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-Flask==2.3.3
-pyxform==1.12.2
+Flask==3.0.0
+pyxform==2.0.0
 gunicorn==21.2.0