[WIP] v2

.github/actions/setup/action.yml

@@ -6,13 +6,10 @@ inputs:
     description: "Python interpreter version"
     required: true
   anki:
-    description: "Anki version. Set this to 'prerelease' to install either the latest release or prerelease."
+    description: "Anki version extra dependency group, as specified in pyproject.toml"
     required: true
-  pyqt:
-    description: "PyQt widget toolkit version"
-    required: true
-  pyqtwebengine:
-    description: "PyQt WebEngine version"
+  qt:
+    description: "Qt version extra dependency group, as specified in pyproject.toml"
     required: true
   chrome:
     description: "Chrome version"
@@ -22,7 +19,7 @@ runs:
   using: "composite"
   steps:
     - name: Checkout pytest-anki
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Set up environment
       uses: ./.github/actions/setup_system
@@ -32,10 +29,8 @@ runs:
 
     - name: Set up project
       uses: ./.github/actions/setup_project
-
-    - name: Set up Anki
-      uses: ./.github/actions/setup_anki
       with:
+        python: ${{ inputs.python }}
         anki: ${{ inputs.anki }}
-        pyqt: ${{ inputs.pyqt }}
-        pyqtwebengine: ${{ inputs.pyqtwebengine }}
+        qt: ${{ inputs.qt }}
+

.github/actions/setup_project/action.yml

@@ -1,16 +1,29 @@
 name: "Set up project"
 description: "Set up project"
 
+inputs:
+  python:
+    description: "Python interpreter version"
+    required: true
+  anki:
+    description: "Anki version extra dependency group, as specified in pyproject.toml"
+    required: true
+  qt:
+    description: "Qt version extra dependency group, as specified in pyproject.toml"
+    required: true
+
 runs:
   using: "composite"
   steps:
-    - name: Install Poetry
-      uses: snok/install-poetry@v1
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
       with:
-        version: 1.1.8
-        virtualenvs-create: false
+        version: "0.6.13"
+        python-version: ${{ inputs.python }}
+        # enable-cache: true
+        # cache-dependency-glob: "uv.lock"
 
     - name: Set up pytest-anki
       shell: bash
       run: |
-        make install
+        uv sync --extra ${{ inputs.anki }} --extra ${{ inputs.qt }} --no-group qt6 --no-group qt5

.github/actions/setup_system/action.yml

@@ -12,13 +12,8 @@ inputs:
 runs:
   using: "composite"
   steps:
-    # Qt5 requires a number of X11-related dependencies to be installed system-wide.
-    # Rather than installing each individually, we install libqt5 on the machine which
-    # in turn takes care of installing all deps also needed for the PyPI version of Qt5
-    - name: Install xvfb / qt dependencies
-      shell: bash
-      run: |
-        sudo apt-get install libqt5gui5
+    - name: Install Qt dependencies
+      uses: tlambert03/setup-qt-libs@v1
 
     - name: Set up chromedriver
       shell: bash
@@ -32,6 +27,6 @@ runs:
         rm "chromedriver_linux64.zip"
 
     - name: Set up Python ${{ inputs.python }}
-      uses: actions/setup-python@v2.2.1
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python }}

.github/workflows/general.yml

@@ -15,108 +15,28 @@ on:
       - ".github/dependabot.yml"
 
 jobs:
-  read-current-anki-matrix:
-    # Reads current Anki set-up from anki-current.json
-    runs-on: ubuntu-latest
-
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-
-    steps:
-    - name: Checkout pytest-anki
-      uses: actions/checkout@v2
-    - id: set-matrix
-      run: |
-        content=$(cat ./pytest_anki/anki-current.json)
-        content="${content//'%'/'%25'}"
-        content="${content//$'\n'/'%0A'}"
-        content="${content//$'\r'/'%0D'}"
-        content="{ \"include\": [ ${content} ] }"
-        echo "::set-output name=matrix::$content"
-
-  check-current-anki:
-    needs: read-current-anki-matrix
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix: ${{ fromJSON(needs.read-current-anki-matrix.outputs.matrix) }}
-
-    steps:
-      - name: Checkout pytest-anki
-        uses: actions/checkout@v2
-
-      - name: Set up test environment
-        uses: ./.github/actions/setup
-        with:
-          python: ${{ matrix.python }}
-          chrome: ${{ matrix.chrome }}
-          anki: ${{ matrix.anki }}
-          pyqt: ${{ matrix.pyqt }}
-          pyqtwebengine: ${{ matrix.pyqtwebengine }}
-
-      - name: Run type checker for Anki ${{ matrix.anki }}
-        shell: bash
-        run: |
-          make check
-
-      - name: Run linter for Anki ${{ matrix.anki }}
-        shell: bash
-        run: |
-          make lint
-
-  test-current-anki:
-    needs: read-current-anki-matrix
-    runs-on: ubuntu-18.04
-
-    strategy:
-      matrix: ${{ fromJSON(needs.read-current-anki-matrix.outputs.matrix) }}
-
-    steps:
-      - name: Checkout pytest-anki
-        uses: actions/checkout@v2
-
-      - name: Set up test environment
-        uses: ./.github/actions/setup
-        with:
-          python: ${{ matrix.python }}
-          chrome: ${{ matrix.chrome }}
-          anki: ${{ matrix.anki }}
-          pyqt: ${{ matrix.pyqt }}
-          pyqtwebengine: ${{ matrix.pyqtwebengine }}
-
-      - name: Run tests for Anki ${{ matrix.anki }}
-        shell: bash
-        run: |
-          make test
-
-  test-old-anki:
-    runs-on: ubuntu-18.04
+  test-anki-matrix:
+    runs-on: ubuntu-24.04
     strategy:
+      fail-fast: false
       matrix:
         include:
-          # Version matrix follows static macOS builds as closely as possible.
-          # Some Qt package versions are not available on PyPI, so we need to make
-          # compromises here and there.
-          - anki: 2.1.44
-            python: 3.8.6
-            pyqt: 5.14.2
-            pyqtwebengine: 5.14.0
-            chrome: 77.0.3865.129
-          - anki: 2.1.35
-            python: 3.8.0
-            pyqt: 5.14.2
-            pyqtwebengine: 5.14.0
-            chrome: 77.0.3865.129
-          - anki: 2.1.28
-            python: 3.8.0
-            pyqt: 5.15.0
-            pyqtwebengine: 5.15.0
-            chrome: 80.0.3987.163
-          - anki: 2.1.26
-            python: 3.8.0
-            pyqt: 5.13.1
-            pyqtwebengine: 5.13.1
-            chrome: 73.0.3683.105
+          - anki: anki-2154
+            python: 3.9.15
+            qt: qt6-2154
+            chrome: 94.0.4606.126
+          - anki: anki-2165
+            python: 3.9.15
+            qt: qt6-2165
+            chrome: 108.0.5359.220
+          - anki: anki-2312
+            python: 3.9.15
+            qt: qt6-2312
+            chrome: 112.0.5615.213
+          - anki: anki-2411
+            python: 3.9.18
+            qt: qt6-2411
+            chrome: 112.0.5615.213
 
     steps:
       - name: Checkout pytest-anki
@@ -128,8 +48,7 @@ jobs:
           python: ${{ matrix.python }}
           chrome: ${{ matrix.chrome }}
           anki: ${{ matrix.anki }}
-          pyqt: ${{ matrix.pyqt }}
-          pyqtwebengine: ${{ matrix.pyqtwebengine }}
+          qt: ${{ matrix.qt }}
 
       - name: Run tests for Anki ${{ matrix.anki }}
         shell: bash

CONTRIBUTORS

@@ -11,3 +11,4 @@ Michal Krassowski <https://github.com/krassowski>
 Andrew Sanchez <https://andrewsanchez.me>
 AMBOSS MD Inc. <https://www.amboss.com/>
 BlueGreenMagick <https://github.com/BlueGreenMagick>
+RisingOrange <https://github.com/risingorange>

Makefile

@@ -7,7 +7,7 @@ TEST_FLAGS ?= -n4
 
 # Set up project
 install:
-	poetry install
+	uv sync --extra anki-2154 --extra qt5-2154 --no-group qt6
 
 # Run tests
 test:
@@ -16,21 +16,21 @@ test:
 # Run type checkers
 check:
 	python -m mypy $(MONITORED_FOLDERS)
+	python -m pyright $(MONITORED_FOLDERS)
 
 # Run code linters
 lint:
-	python -m flake8 $(MONITORED_FOLDERS)
-	python -m black --check $(MONITORED_FOLDERS)
+	python -m ruff check $(MONITORED_FOLDERS)
+	python -m ruff format --check $(MONITORED_FOLDERS)
 
 # Run code formatters
 format:
-	python -m isort $(MONITORED_FOLDERS)
-	python -m autoflake --recursive --in-place --remove-all-unused-imports $(MONITORED_FOLDERS)
-	python -m black $(MONITORED_FOLDERS)
+	python -m ruff check --fix $(MONITORED_FOLDERS)
+	python -m ruff format $(MONITORED_FOLDERS)
 
 # Build project
 build:
-	poetry build
+	uv build
 
 # Show help message
 help:

README.md

@@ -135,7 +135,7 @@ Especially if you run your tests headlessly with `xvfb`, you might run into case
 
 ## Contributing
 
-Contributions are welcome! To set up `pytest-anki` for development, please first make sure you have Python 3.8+ and [poetry](https://python-poetry.org/docs/) installed, then run the following steps:
+Contributions are welcome! To set up `pytest-anki` for development, please first make sure you have Python 3.8+ and [poetry](https://python-poetry.org/docs/) installed (1.3.x or later), then run the following steps:
 
 ```
 $ git clone https://github.com/glutanimate/pytest-anki.git
@@ -156,7 +156,7 @@ make lint
 make test
 ```
 
-This project uses `black`, `isort` and `autoflake` to enforce a consistent code style. To auto-format your code you can use:
+This project uses `ruff` to enforce a consistent code style. To auto-format your code you can use:
 
 ```bash
 make format
@@ -166,7 +166,7 @@ make format
 
 *pytest-anki* is
 
-*Copyright © 2019-2021 [Aristotelis P.](https://glutanimate.com/contact/) (Glutanimate) and [contributors](./CONTRIBUTORS)*
+*Copyright © 2019-2025 [Aristotelis P.](https://glutanimate.com/contact/) (Glutanimate) and [contributors](./CONTRIBUTORS)*
 
 *Copyright © 2017-2019 [Michal Krassowski](https://github.com/krassowski/anki_testing)*