upgrade to python39 (#17945)

* upgrade to python3.9

* py3.9 fix - replace .getiterator with .iter

* include libgit2-dev in Dockerfile[.deploy] setup too

.circleci/config.yml

@@ -282,7 +282,7 @@ references:
 
   docker-images:
     # This is the python version we run in production.
-    - &python "cimg/python:3.8"
+    - &python "cimg/python:3.9"
     - &redis "redis:2.8"
     - &memcached "memcached:1.4"
     - &mysql "circleci/mysql:8.0.25"
@@ -471,7 +471,7 @@ commands:
             curl -sL https://dev.mysql.com/get/mysql-apt-config_0.8.15-1_all.deb --output mysql-apt-config.deb
             sudo dpkg -i mysql-apt-config.deb
             sudo apt-get update -q
-            sudo apt-get install -y gettext pngcrush librsvg2-bin libmysqlclient-dev
+            sudo apt-get install -y gettext pngcrush librsvg2-bin libmysqlclient-dev libgit2-dev
             sudo cp ./docker/etc/mime.types /etc/mime.types
             sudo touch /addons-server-docker-container
       - node/install:

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.9-slim-buster
 
 ENV PYTHONDONTWRITEBYTECODE=1
 
@@ -35,6 +35,7 @@ RUN touch /addons-server-docker-container \
         build-essential \
         curl \
         libcap-dev \
+        libgit2-dev \
         libjpeg-dev \
         libpcre3-dev \
         libsasl2-dev \

Dockerfile.deploy

@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.9-slim-buster
 
 # need to compile swig
 ENV SWIG_FEATURES="-D__x86_64__"
@@ -31,6 +31,7 @@ RUN touch /addons-server-docker-container \
         bash-completion \
         build-essential \
         curl \
+        libgit2-dev \
         libjpeg-dev \
         libsasl2-dev \
         libxml2-dev \

requirements/prod.txt

@@ -414,20 +414,9 @@ mohawk==1.1.0 \
 basket-client==1.0.0 \
     --hash=sha256:fee512c8deabde53aa33b08fa34a992de3085e781be192c4120adb086d0d20c1 \
     --hash=sha256:f9f9ff4870cc1d171ff9f00a8d968336d0e74178f5ac1612bc85be39a3f0cc2c
-pygit2==1.1.1 \
-    --hash=sha256:1b8d344b509063337d62093c6da4c24514c127aed3ad8b54760474e2c7246072 \
-    --hash=sha256:2241e9280b91f602ca0989cc61f56cca8a4c537faaa555e2204481fe181900ee \
-    --hash=sha256:2d40f5cbd06c5067586e0118cd4ac2b8faabd774631918c452c9d64afcaf3b9c \
-    --hash=sha256:313f4358065d9942ac052d1598c80fbd152644926f40178938c65fbb757456bc \
-    --hash=sha256:38d611d1dbb6dc939c26da3ab394a2b9f65149a6aaa3839354b993d400a1c920 \
-    --hash=sha256:526d764a690accd45a534fbc89aac8f7d1aefec5f453279fbac54c93f173fda7 \
-    --hash=sha256:5d59348965a435711468821ebc97d837d24db01571413cc4602d60118a212c27 \
-    --hash=sha256:7563145ea28aa05b823db1f1c96d4ecd3a3df240a502553a6f15e52372b40146 \
-    --hash=sha256:8aeb72645feb537f376c061b0fe7241b600be6d5ea016e361fe4dfbbd1991899 \
-    --hash=sha256:9255d507d5d87bf22dfd57997a78908010331fc21f9a83eca121a53f657beb3c \
-    --hash=sha256:94a64011590f46d026f933f6cbfa09b0617529a4c328634d81ee0db503ab2c6e \
-    --hash=sha256:aef29a3727f75a085c49ca505613554f40629d125c1d11c351e579ca12ee37ba \
-    --hash=sha256:e58f3f52167eb03195592770b743b6b5d929b49042997bd8ade6054195d59e2c
+pygit2==1.4.0 \
+    --hash=sha256:cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8 \
+    --hash=sha256:e9037a7d810750fe23c9f5641ef14a0af2525ff03e14752cd4f73e1870ecfcb0
 webencodings==0.5.1 \
     --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \
     --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923

src/olympia/translations/utils.py

@@ -49,7 +49,7 @@ def trim(tree, limit, killwords, end):
 def text_length(tree):
     """Find the length of the text content, excluding markup."""
     total = 0
-    for node in tree.getiterator():  # Traverse all the tree nodes.
+    for node in tree.iter():  # Traverse all the tree nodes.
         # In etree, a node has a text and tail attribute.
         # Eg: "<b>inner text</b> tail text <em>inner text</em>".
         if node.text: