From 240621df6ab94060069b637203017683b69db879 Mon Sep 17 00:00:00 2001
From: Deimos <deimos@tildes.net>
Date: Sun, 27 Jun 2021 01:37:24 -0600
Subject: [PATCH] Update Python version to 3.9.5

The minimal updates here were to update pygit2 and pip-tools.

However, prospector is currently broken as well, so the full code style
checks currently will not pass. This is not trivial to fix:

  - Currently, pylint returns errors from some of the mypy annotations
  - Upgrading pylint/astroid to the newest version fixes those errors,
    but breaks prospector
  - There is no newer release of prospector

I'm not totally sure how I want to fix this, I may need to fork
prospector.
---
 ansible/roles/python/tasks/main.yml | 4 ++--
 ansible/vars.yml                    | 3 ++-
 tildes/requirements-dev.txt         | 5 +++--
 tildes/requirements.txt             | 5 +++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ansible/roles/python/tasks/main.yml b/ansible/roles/python/tasks/main.yml
index 4bf9c62..acfc5e9 100644
--- a/ansible/roles/python/tasks/main.yml
+++ b/ansible/roles/python/tasks/main.yml
@@ -10,8 +10,8 @@
     - name: Download Python source code
       get_url:
         dest: /tmp/python.tar.gz
-        url: https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tgz
-        checksum: sha256:b37ac74d2cbad2590e7cd0dd2b3826c29afe89a734090a87bf8c03c45066cb65
+        url: https://www.python.org/ftp/python/{{ python_full_version }}/Python-{{ python_full_version }}.tgz
+        checksum: sha256:e0fbd5b6e1ee242524430dee3c91baf4cbbaba4a72dd1674b90fda87b713c7ab
 
     - name: Create temp directory to extract Python to
       file:
diff --git a/ansible/vars.yml b/ansible/vars.yml
index 4012c89..777dcfd 100644
--- a/ansible/vars.yml
+++ b/ansible/vars.yml
@@ -5,4 +5,5 @@ bin_dir: "{{ venv_dir }}/bin"
 
 static_sites_dir: /opt/tildes-static-sites
 
-python_version: 3.8
+python_full_version: 3.9.5
+python_version: "{{ python_full_version.rpartition('.')[0] }}"
diff --git a/tildes/requirements-dev.txt b/tildes/requirements-dev.txt
index 38379d2..8e37d9a 100644
--- a/tildes/requirements-dev.txt
+++ b/tildes/requirements-dev.txt
@@ -43,11 +43,12 @@ packaging==20.4
 parso==0.7.1
 pastedeploy==2.1.1
 pathspec==0.8.0
+pep517==0.10.0
 pep8-naming==0.10.0
 pexpect==4.8.0
 pickleshare==0.7.5
 pillow==8.0.1
-pip-tools==5.3.1
+pip-tools==6.2.0
 plaster-pastedeploy==0.7
 plaster==1.0
 pluggy==0.13.1
@@ -62,7 +63,7 @@ pycodestyle==2.6.0
 pycparser==2.20
 pydocstyle==5.1.1
 pyflakes==2.2.0
-pygit2==1.3.0
+pygit2==1.6.1
 pygments==2.7.2
 pylint-celery==0.3
 pylint-django==2.1.0
diff --git a/tildes/requirements.txt b/tildes/requirements.txt
index 23a3aeb..b09dfec 100644
--- a/tildes/requirements.txt
+++ b/tildes/requirements.txt
@@ -27,10 +27,11 @@ marshmallow==3.9.0
 packaging==20.4
 parso==0.7.1
 pastedeploy==2.1.1
+pep517==0.10.0
 pexpect==4.8.0
 pickleshare==0.7.5
 pillow==8.0.1
-pip-tools==5.3.1
+pip-tools==6.2.0
 plaster-pastedeploy==0.7
 plaster==1.0
 prometheus-client==0.8.0
@@ -39,7 +40,7 @@ psycopg2==2.8.6
 ptyprocess==0.6.0
 publicsuffix2==2.20160818
 pycparser==2.20
-pygit2==1.3.0
+pygit2==1.6.1
 pygments==2.7.2
 pyotp==2.4.1
 pyparsing==2.4.7