Merge branch 'main' into events-app-readme

3 files changed, 78 insertions, 56 deletions

diff --git a/poetry.lock b/poetry.lock
index 404ef9bd..7fad2146 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.4.1 and should not be changed by hand.
 
 [[package]]
 name = "anyio"
@@ -596,19 +596,19 @@ flake8 = ">=5.0.0"
 
 [[package]]
 name = "flake8-bugbear"
-version = "23.3.12"
+version = "23.3.23"
 description = "A plugin for flake8 finding likely bugs and design problems in your program. Contains warnings that don't belong in pyflakes and pycodestyle."
 category = "dev"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8.1"
 files = [
-    {file = "flake8-bugbear-23.3.12.tar.gz", hash = "sha256:e3e7f74c8a49ad3794a7183353026dabd68c74030d5f46571f84c1fb0eb79363"},
-    {file = "flake8_bugbear-23.3.12-py3-none-any.whl", hash = "sha256:beb5c7efcd7ccc2039ef66a77bb8db925e7be3531ff1cb4d0b7030d0e2113d72"},
+    {file = "flake8-bugbear-23.3.23.tar.gz", hash = "sha256:ea565bdb87b96b56dc499edd6cc3ba7f695373d902a5f56c989b74fad7c7719d"},
+    {file = "flake8_bugbear-23.3.23-py3-none-any.whl", hash = "sha256:8a218d13abd6904800970381057ce8e72cde8eea743240c4ef3ede4dd0bc9cfb"},
 ]
 
 [package.dependencies]
 attrs = ">=19.2.0"
-flake8 = ">=3.0.0"
+flake8 = ">=6.0.0"
 
 [package.extras]
 dev = ["coverage", "hypothesis", "hypothesmith (>=0.2)", "pre-commit", "pytest", "tox"]
@@ -826,6 +826,26 @@ files = [
 ]
 
 [[package]]
+name = "importlib-metadata"
+version = "6.1.0"
+description = "Read metadata from Python packages"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "importlib_metadata-6.1.0-py3-none-any.whl", hash = "sha256:ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09"},
+    {file = "importlib_metadata-6.1.0.tar.gz", hash = "sha256:43ce9281e097583d758c2c708c4376371261a02c34682491a8e98352365aad20"},
+]
+
+[package.dependencies]
+zipp = ">=0.5"
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
+perf = ["ipython"]
+testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)"]
+
+[[package]]
 name = "libsass"
 version = "0.22.0"
 description = "Sass for Python: A straightforward binding of libsass for Python."
@@ -842,14 +862,14 @@ files = [
 
 [[package]]
 name = "markdown"
-version = "3.4.1"
-description = "Python implementation of Markdown."
+version = "3.4.3"
+description = "Python implementation of John Gruber's Markdown."
 category = "main"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "Markdown-3.4.1-py3-none-any.whl", hash = "sha256:08fb8465cffd03d10b9dd34a5c3fea908e20391a2a90b88d66362cb05beed186"},
-    {file = "Markdown-3.4.1.tar.gz", hash = "sha256:3b809086bb6efad416156e00a0da66fe47618a5d6918dd688f53f40c8e4cfeff"},
+    {file = "Markdown-3.4.3-py3-none-any.whl", hash = "sha256:065fd4df22da73a625f14890dd77eb8040edcbd68794bcd35943be14490608b2"},
+    {file = "Markdown-3.4.3.tar.gz", hash = "sha256:8bf101198e004dc93e84a12a7395e31aac6a9c9942848ae1d99b9d72cf9b3520"},
 ]
 
 [package.extras]
@@ -1122,18 +1142,6 @@ snowballstemmer = ">=2.2.0"
 toml = ["tomli (>=1.2.3)"]
 
 [[package]]
-name = "pyfakefs"
-version = "5.1.0"
-description = "pyfakefs implements a fake file system that mocks the Python file system modules."
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "pyfakefs-5.1.0-py3-none-any.whl", hash = "sha256:e6f34a8224b41f1b1ab25aa8d430121dac42e3c6e981e01eae76b3343fba47d0"},
-    {file = "pyfakefs-5.1.0.tar.gz", hash = "sha256:316c6026640d14a6b4fbde71fd9674576d1b5710deda8fabde8aad51d785dbc3"},
-]
-
-[[package]]
 name = "pyflakes"
 version = "3.0.1"
 description = "passive checker of Python programs"
@@ -1534,7 +1542,23 @@ files = [
 [package.extras]
 brotli = ["Brotli"]
 
+[[package]]
+name = "zipp"
+version = "3.15.0"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"},
+    {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"},
+]
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
+testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"]
+
 [metadata]
 lock-version = "2.0"
 python-versions = "3.10.*"
-content-hash = "e22311a7b6bba3f8397ba214fe7640a1080c27a63f42262527909d18de6248c1"
+content-hash = "b867bca3c711bbfb2625e5be0469bf7a64757e34f55826632a213f4fc9e8aa7b"
diff --git a/pydis_site/apps/content/tests/helpers.py b/pydis_site/apps/content/tests/helpers.py
index d897c024..fad91050 100644
--- a/pydis_site/apps/content/tests/helpers.py
+++ b/pydis_site/apps/content/tests/helpers.py
@@ -1,12 +1,13 @@
+import atexit
+import shutil
+import tempfile
 from pathlib import Path
 
-from pyfakefs import fake_filesystem_unittest
+from django.test import TestCase
 
 
-# Set the module constant within Patcher to use the fake filesystem
-# https://jmcgeheeiv.github.io/pyfakefs/master/usage.html#modules-to-reload
-with fake_filesystem_unittest.Patcher() as _:
-    BASE_PATH = Path("res")
+BASE_PATH = Path(tempfile.mkdtemp(prefix='pydis-site-content-app-tests-'))
+atexit.register(shutil.rmtree, BASE_PATH, ignore_errors=True)
 
 
 # Valid markdown content with YAML metadata
@@ -50,7 +51,7 @@ PARSED_METADATA = {
 PARSED_CATEGORY_INFO = {"title": "Category Name", "description": "Description"}
 
 
-class MockPagesTestCase(fake_filesystem_unittest.TestCase):
+class MockPagesTestCase(TestCase):
     """
     TestCase with a fake filesystem for testing.
 
@@ -75,29 +76,27 @@ class MockPagesTestCase(fake_filesystem_unittest.TestCase):
 
     def setUp(self):
         """Create the fake filesystem."""
-        self.setUpPyfakefs()
-
-        self.fs.create_file(f"{BASE_PATH}/_info.yml", contents=CATEGORY_INFO)
-        self.fs.create_file(f"{BASE_PATH}/root.md", contents=MARKDOWN_WITH_METADATA)
-        self.fs.create_file(
-            f"{BASE_PATH}/root_without_metadata.md", contents=MARKDOWN_WITHOUT_METADATA
-        )
-        self.fs.create_file(f"{BASE_PATH}/not_a_page.md/_info.yml", contents=CATEGORY_INFO)
-        self.fs.create_file(f"{BASE_PATH}/category/_info.yml", contents=CATEGORY_INFO)
-        self.fs.create_file(
-            f"{BASE_PATH}/category/with_metadata.md", contents=MARKDOWN_WITH_METADATA
-        )
-        self.fs.create_file(f"{BASE_PATH}/category/subcategory/_info.yml", contents=CATEGORY_INFO)
-        self.fs.create_file(
-            f"{BASE_PATH}/category/subcategory/with_metadata.md", contents=MARKDOWN_WITH_METADATA
-        )
-        self.fs.create_file(
-            f"{BASE_PATH}/category/subcategory/without_metadata.md",
-            contents=MARKDOWN_WITHOUT_METADATA
-        )
+        Path(f"{BASE_PATH}/_info.yml").write_text(CATEGORY_INFO)
+        Path(f"{BASE_PATH}/root.md").write_text(MARKDOWN_WITH_METADATA)
+        Path(f"{BASE_PATH}/root_without_metadata.md").write_text(MARKDOWN_WITHOUT_METADATA)
+        Path(f"{BASE_PATH}/not_a_page.md").mkdir(exist_ok=True)
+        Path(f"{BASE_PATH}/not_a_page.md/_info.yml").write_text(CATEGORY_INFO)
+        Path(f"{BASE_PATH}/category").mkdir(exist_ok=True)
+        Path(f"{BASE_PATH}/category/_info.yml").write_text(CATEGORY_INFO)
+        Path(f"{BASE_PATH}/category/with_metadata.md").write_text(MARKDOWN_WITH_METADATA)
+        Path(f"{BASE_PATH}/category/subcategory").mkdir(exist_ok=True)
+        Path(f"{BASE_PATH}/category/subcategory/_info.yml").write_text(CATEGORY_INFO)
+        Path(
+            f"{BASE_PATH}/category/subcategory/with_metadata.md"
+        ).write_text(MARKDOWN_WITH_METADATA)
+        Path(
+            f"{BASE_PATH}/category/subcategory/without_metadata.md"
+        ).write_text(MARKDOWN_WITHOUT_METADATA)
 
         temp = f"{BASE_PATH}/tmp"  # noqa: S108
-        self.fs.create_file(f"{temp}/_info.yml", contents=CATEGORY_INFO)
-        self.fs.create_file(f"{temp}.md", contents=MARKDOWN_WITH_METADATA)
-        self.fs.create_file(f"{temp}/category/_info.yml", contents=CATEGORY_INFO)
-        self.fs.create_dir(f"{temp}/category/subcategory_without_info")
+        Path(f"{temp}").mkdir(exist_ok=True)
+        Path(f"{temp}/_info.yml").write_text(CATEGORY_INFO)
+        Path(f"{temp}.md").write_text(MARKDOWN_WITH_METADATA)
+        Path(f"{temp}/category").mkdir(exist_ok=True)
+        Path(f"{temp}/category/_info.yml").write_text(CATEGORY_INFO)
+        Path(f"{temp}/category/subcategory_without_info").mkdir(exist_ok=True)
diff --git a/pyproject.toml b/pyproject.toml
index a8579c3f..21857f84 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,7 @@ django-simple-bulma = "2.5.0"
 djangorestframework = "3.14.0"
 gunicorn = "20.1.0"
 httpx = "0.23.3"
-markdown = "3.4.1"
+markdown = "3.4.3"
 psycopg2-binary = "2.9.5"
 PyJWT = {version = "2.6.0", extras = ["crypto"]}
 pymdown-extensions = "9.10"
@@ -34,7 +34,7 @@ taskipy = "1.10.3"
 flake8 = "6.0.0"
 flake8-annotations = "3.0.0"
 flake8-bandit = "4.1.1"
-flake8-bugbear = "23.3.12"
+flake8-bugbear = "23.3.23"
 flake8-docstrings = "1.7.0"
 flake8-import-order = "0.18.2"
 flake8-tidy-imports = "4.8.0"
@@ -45,7 +45,6 @@ pre-commit = "3.2.0"
 
 [tool.poetry.group.test.dependencies]
 coverage = "7.2.2"
-pyfakefs = "5.1.0"
 
 [build-system]
 requires = ["poetry-core>=1.2.0"]