Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cannot import name 'escape' from 'jinja2' #183

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.venv38


# Byte-compiled / optimized / DLL files
*__pycache__/
*.py[cod]
Expand Down
13 changes: 13 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM python:3.8-slim

WORKDIR /app
COPY . .

RUN apt-get update && apt-get install -y gcc libc6-dev libffi-dev libgl1-mesa-glx libglib2.0-0 ghostscript

RUN pip install .

EXPOSE 5000

RUN excalibur initdb
CMD ["excalibur", "webserver"]
8 changes: 8 additions & 0 deletions compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: '3.8'

services:
excalibur:
build: .
ports:
- "5000:5000"

2 changes: 1 addition & 1 deletion excalibur/config_templates/default_excalibur.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ logging_level = INFO
[webserver]
# The host interface on which to listen.
# 127.0.0.1 means the web server will only respond to requests from the local machine.
web_server_host = 127.0.0.1
web_server_host = 0.0.0.0

# The port on which to run the web server.
web_server_port = 5000
Expand Down
2 changes: 1 addition & 1 deletion excalibur/www/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
render_template,
send_from_directory,
)
from werkzeug import secure_filename
from werkzeug.utils import secure_filename

from .. import configuration as conf
from ..models import Job, File, Rule
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
"celery>=4.1.1",
"Click>=7.0",
"configparser>=3.5.0, <3.6.0",
"Flask>=1.0.2",
"Flask>=2.1.1",
"SQLAlchemy>=1.2.12",
"Werkzeug<1.0.0",
"PyPDF2==2.0",
"pandas==1.5.3",
]
mysql = ["mysqlclient>=1.3.6"]
all_requires = requires + mysql
Expand Down