From 17ac650531767b311e3b656535fb149e8e52f452 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Sat, 26 Dec 2020 14:36:46 +0100
Subject: [PATCH] Upgrade to python 3.9

---
 .builds/freebsd.yml  |  6 +++---
 ansible/playbook.yml | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index b25bbe1..135af63 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -1,7 +1,7 @@
 image: freebsd/12.x
 packages:
-  - python38
-  - py38-sqlite3
+  - python39
+  - py39-sqlite3
   - jpeg-turbo
   - py37-ansible
 sources:
@@ -14,7 +14,7 @@ environment:
 tasks:
   - install_poetry: |
       mkdir $HOME/bin
-      ln -s $(which python3.8) $HOME/bin/python
+      ln -s $(which python3.9) $HOME/bin/python
       curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
       echo "source $HOME/.poetry/env" >> ~/.buildenv
   - install_deps: |
diff --git a/ansible/playbook.yml b/ansible/playbook.yml
index c84828b..4a39a1b 100644
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@@ -2,35 +2,39 @@
 - name: deploy blog
   hosts: blognas
   remote_user: root
-  environment:
-    PATH: /root/.poetry/bin:{{ ansible_env.PATH }}
+#  environment:
+#    PATH: /root/.poetry/bin:{{ ansible_env.PATH }}
 
   tasks:
     - name: install system dependencies
       pkgng:
-        name: git,python38,py38-sqlite3,jpeg-turbo,nginx,curl,vim
-    - name: make python3.8 default
+        name: git,python39,py39-sqlite3,jpeg-turbo,nginx,curl,vim
+    - name: make python3.9 default
       file:
         path: /usr/local/bin/python3
-        src: /usr/local/bin/python3.8
+        src: /usr/local/bin/python3.9
         state: link
+    - name: install pip
+      shell:
+        cmd: python -m ensurepip
+        creates: /usr/local/lib/python3.9/site-packages/pip
     - name: fetch code
       git:
         repo: https://git.sr.ht/~crocmagnon/blog
         dest: /srv/blog
         force: yes
-    - name: install poetry
-      shell:
-        cmd: POETRY_VERSION=1.1.4 curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
-        creates: /root/.poetry/bin/poetry
     - name: create venv
       shell:
         cmd: python -m venv /srv/blogvenv
         creates: /srv/blogvenv/bin/python
+    - name: install poetry
+      shell:
+        cmd: . /srv/blogvenv/bin/activate && python -m pip install poetry==1.1.4
+        creates: /srv/blogvenv/bin/poetry
     - name: install python dependencies
       shell:
         chdir: /srv/blog
-        cmd: . /srv/blogvenv/bin/activate && poetry install --no-dev --remove-untracked
+        cmd: . /srv/blogvenv/bin/activate && poetry install --no-dev
     - name: install service
       copy:
         remote_src: yes