Merge branch 'develop' into erikj/py312_asyncio

matrix-org · Nov 27, 2023 · be3ec4d · be3ec4d
2 parents 1a1a0bc + 62e96a2
commit be3ec4d
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/changelog.d/16684.misc b/changelog.d/16684.misc
@@ -0,0 +1 @@
+Reoranganise test files.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -321,7 +321,7 @@ all = [
 # This helps prevents merge conflicts when running a batch of dependabot updates.
 isort = ">=5.10.1"
 black = ">=22.7.0"
-ruff = "0.1.4"
+ruff = "0.1.6"
 # Type checking only works with the pydantic.v1 compat module from pydantic v2
 pydantic = "^2"
 

diff --git a/tests/rest/media/test_media_retention.py → tests/media/test_media_retention.py b/tests/rest/media/test_media_retention.py → tests/media/test_media_retention.py