Narrow the importlib_metadata dependency

David Robertson · David Robertson · commit 50290790abbc · 2022-04-06T17:06:09.000+01:00
`pyproject.toml` already has the version guard. I struggled to work out how to reproduce this guard under setuptools in #12384. But I really should have persisted there; without this, poetry and setuptools generate different sets of requirements. That means a poetry-installed Synapse on a 3.8+ interpreter will fail the runtime dependency checks.
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
@@ -91,7 +91,7 @@
     "packaging>=16.1",
     # At the time of writing, we only use functions from the version `importlib.metadata`
     # which shipped in Python 3.8. This corresponds to version 1.4 of the backport.
-    "importlib_metadata>=1.4",
+    "importlib_metadata>=1.4 ; python_version < '3.8'",
 ]
 
 CONDITIONAL_REQUIREMENTS = {

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`"packaging>=16.1",`
`92`	`92`	# At the time of writing, we only use functions from the version `importlib.metadata`
`93`	`93`	`# which shipped in Python 3.8. This corresponds to version 1.4 of the backport.`
`94`		`- "importlib_metadata>=1.4",`
	`94`	`+ "importlib_metadata>=1.4 ; python_version < '3.8'",`
`95`	`95`	`]`
`96`	`96`
`97`	`97`	`CONDITIONAL_REQUIREMENTS = {`