Ensure type annotations are backwards compatible

Related: pimutils/todoman#544

Author: WhyNotHugo

contrib/conflict_resolution/resolve_interactively.py

@@ -16,6 +16,8 @@
 SPDX-FileCopyrightText: 2021 Intevation GmbH <https://intevation.de>
 Author: <[email protected]>
 """
+from __future__ import annotations
+
 import re
 import subprocess
 import sys

docs/conf.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 import os
 

pyproject.toml

@@ -14,6 +14,7 @@ target-version = "py37"
 
 [tool.ruff.isort]
 force-single-line = true
+required-imports = ["from __future__ import annotations"]
 
 [tool.pytest.ini_options]
 addopts = """

setup.py

@@ -4,6 +4,8 @@
 Please refer to https://vdirsyncer.pimutils.org/en/stable/packaging.html for
 how to package vdirsyncer.
 """
+from __future__ import annotations
+
 from setuptools import Command
 from setuptools import find_packages
 from setuptools import setup

tests/__init__.py

@@ -1,6 +1,8 @@
 """
 Test suite for vdirsyncer.
 """
+from __future__ import annotations
+
 import hypothesis.strategies as st
 import urllib3.exceptions
 

tests/conftest.py

@@ -1,6 +1,8 @@
 """
 General-purpose fixtures for vdirsyncer's testsuite.
 """
+from __future__ import annotations
+
 import logging
 import os
 

tests/storage/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import random
 import textwrap
 import uuid

tests/storage/conftest.py

@@ -1,9 +1,10 @@
+from __future__ import annotations
+
 import asyncio
 import contextlib
 import subprocess
 import time
 import uuid
-from typing import Type
 
 import aiostream
 import pytest
@@ -90,7 +91,7 @@ async def slow_create_collection(request, aio_connector):
     # storage limits.
     to_delete = []
 
-    async def inner(cls: Type, args: dict, collection_name: str) -> dict:
+    async def inner(cls: type, args: dict, collection_name: str) -> dict:
         """Create a collection
 
         Returns args necessary to create a Storage instance pointing to it.

tests/storage/dav/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import uuid
 

tests/storage/dav/test_caldav.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import datetime
 from textwrap import dedent