Merge pull request #10 from fecgov/Sprint30

Sprint30
fecgov · Apr 21, 2020 · 4e5c136 · 4e5c136
2 parents a483247 + 658d708
commit 4e5c136
Show file tree

Hide file tree

Showing 19 changed files with 70 additions and 48 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,9 +15,9 @@ DEBIAN_FRONTEND=nointeractive apt-get update && apt-get install -y apt-utils &&
 RUN rm -rf /var/lib/apt/lists/* \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
-RUN wget --quiet -O wkhtmltopdf.tar.xz "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz" && \
-    tar -xvf wkhtmltopdf.tar.xz && \
-    mv wkhtmltox/bin/wkhtmlto* /usr/bin/ 
+RUN wget --quiet -O wkhtmltopdf.tar.xz "https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz"
+RUN tar -xvf wkhtmltopdf.tar.xz
+RUN mv wkhtmltox/bin/wkhtmlto* /usr/bin/
 
 ENV LANG en_US.utf8
 

diff --git a/requirements.txt b/requirements.txt
@@ -9,15 +9,15 @@ Flask-HTTPAuth==3.2.4
 idna==2.7
 itsdangerous==0.24
 Jinja2==2.10.1
-MarkupSafe==1.0
+MarkupSafe==1.1.1
 passlib==1.7.1
 python-json-logger==0.1.9
 requests==2.22.0
 six==1.11.0
 urllib3==1.25.3
 Werkzeug==0.15.3
 WeasyPrint==47
-
+ipdb==0.12.3
 pypdftk==0.4
 boto3==1.9.40
 botocore==1.12.196

diff --git a/routes/src/form3x.py b/routes/src/form3x.py
diff --git a/templates/forms/F3X.pdf b/templates/forms/F3X.pdf
diff --git a/templates/forms/SA.pdf b/templates/forms/SA.pdf
diff --git a/templates/forms/SC.pdf b/templates/forms/SC.pdf
diff --git a/templates/forms/SC1.pdf b/templates/forms/SC1.pdf
diff --git a/templates/forms/SD.pdf b/templates/forms/SD.pdf
diff --git a/templates/forms/SE.pdf b/templates/forms/SE.pdf
diff --git a/templates/forms/SF.pdf b/templates/forms/SF.pdf
diff --git a/templates/forms/SH1.pdf b/templates/forms/SH1.pdf
diff --git a/templates/forms/SH2.pdf b/templates/forms/SH2.pdf
diff --git a/templates/forms/SH3.pdf b/templates/forms/SH3.pdf
diff --git a/templates/forms/SH4.pdf b/templates/forms/SH4.pdf
diff --git a/templates/forms/SH5.pdf b/templates/forms/SH5.pdf
diff --git a/templates/forms/SH6.pdf b/templates/forms/SH6.pdf
diff --git a/templates/forms/SL-A.pdf b/templates/forms/SL-A.pdf
diff --git a/templates/forms/SL-B.pdf b/templates/forms/SL-B.pdf
diff --git a/templates/forms/SL.pdf b/templates/forms/SL.pdf