Import commits from branch

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
     branches: ["main"]
   pull_request:
 
-jobs: 
+jobs:
   check-code-style:
     name: Check code style
     runs-on: ubuntu-latest
@@ -13,11 +13,17 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
-      - uses: actions/setup-python@v2
+
+      - name: Setup Poetry
+        uses: matrix-org/setup-python-poetry@v1
         with:
-          python-version: "3.11"
-      - run: python -m pip install tox "poetry==1.8.3"
-      - run: tox -e check_codestyle
+          install-project: "false"
+
+      - name: Run ruff check
+        run: poetry run ruff check --output-format=github .
+
+      - name: Run ruff format
+        run: poetry run ruff format --check .
 
   check-types:
     name: Check types with Mypy
@@ -26,12 +32,31 @@ jobs:
       - run: sudo apt-get install -y libmagic1
       - uses: actions/checkout@v4
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-      - uses: actions/setup-python@v2
+        uses: dtolnay/[email protected]
+      - uses: Swatinem/rust-cache@v2
+
+      - name: Setup Poetry
+        uses: matrix-org/setup-python-poetry@v1
         with:
-          python-version: "3.11"
-      - run: python -m pip install tox "poetry==1.8.3"
-      - run: tox -e check_types
+          # We have seen odd mypy failures that were resolved when we started
+          # installing the project again:
+          # https://github.com/matrix-org/synapse/pull/15376#issuecomment-1498983775
+          # To make CI green, err towards caution and install the project.
+          install-project: "true"
+
+      # Cribbed from
+      # https://github.com/AustinScola/mypy-cache-github-action/blob/85ea4f2972abed39b33bd02c36e341b28ca59213/src/restore.ts#L10-L17
+      - name: Restore/persist mypy's cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            .mypy_cache
+          key: mypy-cache-${{ github.context.sha }}
+          restore-keys: mypy-cache-
+
+      - name: Run mypy
+        run: poetry run mypy
+
 
   unit-tests:
     name: Unit tests

config.sample.yaml

@@ -36,9 +36,20 @@ scan:
 
     # List of allowed MIME types. If a file has a MIME type that's not in this list, its
     # scan is considered failed.
+    # Unrecognised binary files are considered to be `application/octet-stream`.
+    # Unrecognised text files are considered to be `text/plain`.
     # Optional, defaults to allowing all MIME types.
     allowed_mimetypes: ["image/jpeg"]
 
+    # List of blocked MIME types.
+    # If specified, `allowed_mimetypes` must not be specified as well.
+    # If specified, a file whose MIME type is on this list will produce a scan that is
+    # considered failed.
+    # Unrecognised binary files are considered to be `application/octet-stream`.
+    # Unrecognised text files are considered to be `text/plain`.
+    # Optional.
+    # blocked_mimetypes: ["image/jpeg"]
+
 # Configuration of scan result caching.
 #
 # Results are stored in a cache to avoid having to download and scan a file twice. There

mypy.ini

@@ -1,2 +1,5 @@
 [mypy]
-strict = true
+strict = true
+files =
+  tests/,
+  src/