aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pydis_site/context_processors.py2
-rw-r--r--pydis_site/settings.py2
-rw-r--r--pydis_site/tests/test_utils.py11
-rw-r--r--pydis_site/utils/__init__.py3
-rw-r--r--pydis_site/utils/resources.py10
-rw-r--r--pydis_site/utils/utils.py10
6 files changed, 26 insertions, 12 deletions
diff --git a/pydis_site/context_processors.py b/pydis_site/context_processors.py
index e905d9c7..ab5a4168 100644
--- a/pydis_site/context_processors.py
+++ b/pydis_site/context_processors.py
@@ -1,6 +1,6 @@
from django.template import RequestContext
-from pydis_site.utils.resources import get_git_sha
+from pydis_site.utils import get_git_sha
def git_sha_processor(_: RequestContext) -> dict:
diff --git a/pydis_site/settings.py b/pydis_site/settings.py
index e707a526..0a5b0eed 100644
--- a/pydis_site/settings.py
+++ b/pydis_site/settings.py
@@ -20,7 +20,7 @@ import sentry_sdk
from django.contrib.messages import constants as messages
from sentry_sdk.integrations.django import DjangoIntegration
-from pydis_site.utils.resources import get_git_sha
+from pydis_site.utils import get_git_sha
if typing.TYPE_CHECKING:
from django.contrib.auth.models import User
diff --git a/pydis_site/tests/test_utils.py b/pydis_site/tests/test_utils.py
new file mode 100644
index 00000000..f1419860
--- /dev/null
+++ b/pydis_site/tests/test_utils.py
@@ -0,0 +1,11 @@
+from django.test import TestCase
+
+from pydis_site.utils import get_git_sha
+from pydis_site.utils.utils import GIT_SHA
+
+
+class UtilsTests(TestCase):
+
+ def test_git_sha(self):
+ """Test that the get_git_sha returns the correct SHA."""
+ self.assertEqual(get_git_sha(), GIT_SHA)
diff --git a/pydis_site/utils/__init__.py b/pydis_site/utils/__init__.py
new file mode 100644
index 00000000..bb91b3d8
--- /dev/null
+++ b/pydis_site/utils/__init__.py
@@ -0,0 +1,3 @@
+from .utils import get_git_sha
+
+__all__ = ['get_git_sha']
diff --git a/pydis_site/utils/resources.py b/pydis_site/utils/resources.py
index d36c4b77..637fd785 100644
--- a/pydis_site/utils/resources.py
+++ b/pydis_site/utils/resources.py
@@ -4,13 +4,8 @@ import glob
import typing
from dataclasses import dataclass
-import git
import yaml
-# Git SHA
-repo = git.Repo(search_parent_directories=True)
-GIT_SHA = repo.head.object.hexsha
-
@dataclass
class URL:
@@ -94,8 +89,3 @@ def load_categories(order: typing.List[str]) -> typing.List[Category]:
categories.append(Category.construct_from_directory(direc))
return categories
-
-
-def get_git_sha() -> str:
- """Get the Git SHA for this repo."""
- return GIT_SHA
diff --git a/pydis_site/utils/utils.py b/pydis_site/utils/utils.py
new file mode 100644
index 00000000..2033ea19
--- /dev/null
+++ b/pydis_site/utils/utils.py
@@ -0,0 +1,10 @@
+import git
+
+# Git SHA
+repo = git.Repo(search_parent_directories=True)
+GIT_SHA = repo.head.object.hexsha
+
+
+def get_git_sha() -> str:
+ """Get the Git SHA for this repo."""
+ return GIT_SHA