importlib-metadata & importlib-resources

procrastinate/contrib/django/migrations_magic.py

@@ -6,9 +6,14 @@
 from typing import Iterable, Iterator, Optional, Tuple
 
 import attr
-import importlib_resources
 from django.db import migrations
 
+# https://github.com/pypa/twine/pull/551
+if sys.version_info[:2] <= (3, 9):  # coverage: exclude
+    import importlib_resources
+else:
+    import importlib.resources as importlib_resources
+
 # For a thorough explaination of what this package does, see README.md in the same
 # folder
 

procrastinate/metadata.py

@@ -1,6 +1,11 @@
+import sys
 from typing import Mapping
 
-import importlib_metadata
+# https://github.com/pypa/twine/pull/551
+if sys.version_info[:2] <= (3, 8):  # coverage: exclude
+    import importlib_metadata
+else:
+    import importlib.metadata as importlib_metadata
 
 
 def extract_metadata() -> Mapping[str, str]:

procrastinate/schema.py

@@ -1,6 +1,11 @@
 import pathlib
+import sys
 
-import importlib_resources
+# https://github.com/pypa/twine/pull/551
+if sys.version_info[:2] <= (3, 9):  # coverage: exclude
+    import importlib_resources
+else:
+    import importlib.resources as importlib_resources
 
 from procrastinate import connector as connector_module
 

procrastinate/sql/__init__.py

@@ -1,7 +1,12 @@
 import re
+import sys
 from typing import Dict
 
-from importlib_resources import read_text
+# https://github.com/pypa/twine/pull/551
+if sys.version_info[:2] <= (3, 9):  # coverage: exclude
+    import importlib_resources
+else:
+    import importlib.resources as importlib_resources
 
 QUERIES_REGEX = re.compile(r"(?:\n|^)-- ([a-z0-9_]+) --\n(?:-- .+\n)*", re.MULTILINE)
 
@@ -21,7 +26,9 @@ def parse_query_file(query_file: str) -> Dict["str", "str"]:
 
 
 def get_queries() -> Dict["str", "str"]:
-    return parse_query_file(read_text("procrastinate.sql", "queries.sql"))
+    return parse_query_file(
+        importlib_resources.read_text("procrastinate.sql", "queries.sql")
+    )
 
 
 queries = get_queries()

pyproject.toml

@@ -34,7 +34,7 @@ psycopg2-binary = "*"
 python-dateutil = "*"
 typing-extensions = "*"
 importlib-metadata = {version = "*", python = "<3.8"}
-importlib-resources = {version = "*", python = "<3.8"}
+importlib-resources = {version = "*", python = "<3.9"}
 Django = {version = ">=2.2", extras = ["django"]}
 
 [tool.poetry.dev-dependencies]