Fix bug 1644770 - Bump Python to 3.8.3 and Psycopg2 to 2.8.5 (#1646)

.travis.yml

@@ -2,7 +2,7 @@ dist: xenial
 sudo: false
 language: python
 python:
-  - '3.7'
+  - '3.8'
 
 cache:
   pip: true

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7.6-stretch
+FROM python:3.8.3-buster
 
 ARG USER_ID=1000
 ARG GROUP_ID=1000
@@ -32,8 +32,8 @@ RUN apt-get update \
         build-essential \
         libmemcached-dev \
         nodejs \
-        postgresql-client-9.6 \
-        postgresql-server-dev-9.6 \
+        postgresql-client-11 \
+        postgresql-server-dev-11 \
         yarn \
     # Clean up what can be cleaned up.
     && apt-get autoremove -y

pontoon/base/templatetags/helpers.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-import cgi
+import html
 import datetime
 import json
 
@@ -252,10 +252,7 @@ def format_timedelta(value):
 @library.filter
 def nospam(self):
     return jinja2.Markup(
-        cgi.escape(self, True)
-        .replace("@", "@")
-        .replace(".", ".")
-        .replace("'", """)
+        html.escape(self, True).replace("@", "@").replace(".", ".")
     )
 
 

pontoon/base/tests/test_helpers.py

@@ -148,4 +148,4 @@ def test_helper_base_nospam_unicode(settings):
 
 
 def test_helper_base_nospam_escape(settings):
-    assert str(nospam("<>'\"@&")) == "&lt;&gt;&quot;&quot;&#64;&amp;"
+    assert str(nospam("<>'\"@&")) == "&lt;&gt;&#x27;&quot;&#64;&amp;"

requirements/constraints.txt

@@ -76,8 +76,8 @@ webencodings==0.5.1 \
     --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78
 
 # caighdean
-sacremoses==0.0.19 \
-    --hash=sha256:4220bf1474b2d735b6d7e2b27e839ac110cf0f9b4fc244fd649707dd738e3430 \
+sacremoses==0.0.43 \
+    --hash=sha256:123c1bf2664351fb05e16f87d3786dbe44a050cfd7b85161c09ad9a63a8e2948
 
 # sacremoses
 click==7.0 \
@@ -85,9 +85,9 @@ click==7.0 \
     --hash=sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7
 
 # sacremoses
-joblib==0.13.2 \
-    --hash=sha256:21e0c34a69ad7fde4f2b1f3402290e9ec46f545f15f1541c582edfe05d87b63a \
-    --hash=sha256:315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524
+joblib==0.15.1 \
+    --hash=sha256:61e49189c84b3c5d99a969d314853f4d1d263316cc694bec17548ebaa9c47b6e \
+    --hash=sha256:6825784ffda353cc8a1be573118085789e5b5d29401856b35b756645ab5aecb5
 
 # sacremoses
 tqdm==4.31.1 \

requirements/default.txt

@@ -119,9 +119,20 @@ parsimonious==0.6.2 \
 polib==1.0.6 \
     --hash=sha256:b1ea141d58ed5e48aed2674f7c894dfb83f639c3286d7b32b2e19fa032a5b400 \
     --hash=sha256:20d2a0d589a692c11df549bd7cda83c665eef2a83e017b843fecdf956edbad74
-psycopg2==2.7.3.2 \
-    --hash=sha256:7a9c6c62e6e05df5406e9b5235c31c376a22620ef26715a663cee57083b3c2ea \
-    --hash=sha256:5c3213be557d0468f9df8fe2487eaf2990d9799202c5ff5cb8d394d09fad9b2a
+psycopg2==2.8.5 \
+    --hash=sha256:132efc7ee46a763e68a815f4d26223d9c679953cd190f1f218187cb60decf535 \
+    --hash=sha256:2327bf42c1744a434ed8ed0bbaa9168cac7ee5a22a9001f6fc85c33b8a4a14b7 \
+    --hash=sha256:27c633f2d5db0fc27b51f1b08f410715b59fa3802987aec91aeb8f562724e95c \
+    --hash=sha256:2c0afb40cfb4d53487ee2ebe128649028c9a78d2476d14a67781e45dc287f080 \
+    --hash=sha256:2df2bf1b87305bd95eb3ac666ee1f00a9c83d10927b8144e8e39644218f4cf81 \
+    --hash=sha256:440a3ea2c955e89321a138eb7582aa1d22fe286c7d65e26a2c5411af0a88ae72 \
+    --hash=sha256:6a471d4d2a6f14c97a882e8d3124869bc623f3df6177eefe02994ea41fd45b52 \
+    --hash=sha256:6b306dae53ec7f4f67a10942cf8ac85de930ea90e9903e2df4001f69b7833f7e \
+    --hash=sha256:a0984ff49e176062fcdc8a5a2a670c9bb1704a2f69548bce8f8a7bad41c661bf \
+    --hash=sha256:ac5b23d0199c012ad91ed1bbb971b7666da651c6371529b1be8cbe2a7bf3c3a9 \
+    --hash=sha256:acf56d564e443e3dea152efe972b1434058244298a94348fc518d6dd6a9fb0bb \
+    --hash=sha256:d3b29d717d39d3580efd760a9a46a7418408acebbb784717c90d708c9ed5f055 \
+    --hash=sha256:f7d46240f7a1ae1dd95aab38bd74f7428d46531f69219954266d669da60c0818
 py-dateutil==2.2 \
     --hash=sha256:7efa2ca17159c590408cb624de9aa10d360f14097cb70dd7559e632f2cf4b048
 python-levenshtein==0.12.0 \

runtime.txt

@@ -1 +1 @@
-python-3.7.7
+python-3.8.3