From d755a8536618e09a797a0d39eab04d57ee2bfec0 Mon Sep 17 00:00:00 2001
From: Kyle Verhoog <kyle@verhoog.ca>
Date: Tue, 29 Aug 2023 17:28:38 -0400
Subject: [PATCH] ci: fix and update dependencies

---
 .github/workflows/main.yml | 44 ++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a6e27a0..b7aa4e9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,10 +11,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
-      - name: Install project
-        run: pip install .
-      - name: Run command
+          python-version: '3.11'
+      - name: Check formatting
         run: |
           pip3 install riot
           riot -v run -s black -- --check .
@@ -24,12 +22,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.11'
       - name: Install project
         run: pip install .
       - name: Run command
         run: |
-          pip3 install riot
+          python -m pip install riot
           riot -v run -s mypy
   flake8:
     runs-on: ubuntu-latest
@@ -37,35 +35,31 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
-      - name: Install project
-        run: pip install .
+          python-version: '3.11'
       - name: Run command
         run: |
-          pip3 install riot
+          python -m pip install riot
           riot -v run -s flake8
   test:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", pypy-3.7]
+        python-image: [
+          "python:2.7",
+          "python:3.5",
+          "python:3.6",
+          "python:3.7",
+          "python:3.8",
+          "python:3.9",
+          "python:3.10",
+          "python:3.11",
+          "pypy:3.7",
+        ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Setup Python 3 (for riot)
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.9"
-      - name: Install project
-        run: |
-          pip install setuptools
-          pip install .
+      - uses: docker://${{ matrix.python-image }}
       - name: Run tests
         run: |
-          python3.9 -m pip install riot
+          python -m pip install riot
           riot -v run --python=${{ matrix.python-version }} smoke-test
           riot -v run --python=${{ matrix.python-version }} tests