aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jeremiah Boby <[email protected]>2019-07-10 02:45:41 +0100
committerGravatar Jeremiah Boby <[email protected]>2019-07-10 02:45:41 +0100
commit56b7cbd351fcf2850a8f840293bea1ca007ea3ba (patch)
treec3ddcabfb37b3e34d82ada4f22b25ab203fec4f0
parentRemove extra space in flake8 (diff)
Teach new lint rules to old code
-rwxr-xr-xmanage.py1
-rw-r--r--pydis_site/apps/home/templatetags/wiki_extra.py1
-rw-r--r--pydis_site/apps/home/tests/test_repodata_helpers.py6
-rw-r--r--pydis_site/apps/home/views/home.py3
-rw-r--r--pydis_site/utils/resources.py3
5 files changed, 3 insertions, 11 deletions
diff --git a/manage.py b/manage.py
index 37cca124..b257ea65 100755
--- a/manage.py
+++ b/manage.py
@@ -6,7 +6,6 @@ import sys
# Separate definition to ease calling this in other scripts.
def main():
"""Entry point for Django management script."""
-
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pydis_site.settings')
try:
from django.core.management import execute_from_command_line
diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py
index ab14f7be..ea6a5e61 100644
--- a/pydis_site/apps/home/templatetags/wiki_extra.py
+++ b/pydis_site/apps/home/templatetags/wiki_extra.py
@@ -130,7 +130,6 @@ def render_urlpath(value: Union[URLPath, str]):
Usage: `{{ url_path | render_urlpath }}`
"""
-
if isinstance(value, str):
return value or "/"
diff --git a/pydis_site/apps/home/tests/test_repodata_helpers.py b/pydis_site/apps/home/tests/test_repodata_helpers.py
index 59cb2331..df1ffd73 100644
--- a/pydis_site/apps/home/tests/test_repodata_helpers.py
+++ b/pydis_site/apps/home/tests/test_repodata_helpers.py
@@ -34,13 +34,11 @@ class TestRepositoryMetadataHelpers(TestCase):
def setUp(self):
"""Executed before each test method."""
-
self.home_view = HomeView()
@mock.patch('requests.get', side_effect=mocked_requests_get)
def test_returns_metadata(self, _: mock.MagicMock):
"""Test if the _get_repo_data helper actually returns what it should."""
-
metadata = self.home_view._get_repo_data()
self.assertIsInstance(metadata[0], RepositoryMetadata)
@@ -48,7 +46,6 @@ class TestRepositoryMetadataHelpers(TestCase):
def test_returns_cached_metadata(self):
"""Test if the _get_repo_data helper returns cached data when available."""
-
repo_data = RepositoryMetadata(
repo_name="python-discord/site",
description="testrepo",
@@ -65,7 +62,6 @@ class TestRepositoryMetadataHelpers(TestCase):
@mock.patch('requests.get', side_effect=mocked_requests_get)
def test_refresh_stale_metadata(self, _: mock.MagicMock):
"""Test if the _get_repo_data helper will refresh when the data is stale"""
-
repo_data = RepositoryMetadata(
repo_name="python-discord/site",
description="testrepo",
@@ -82,7 +78,6 @@ class TestRepositoryMetadataHelpers(TestCase):
@mock.patch('requests.get', side_effect=mocked_requests_get)
def test_returns_api_data(self, _: mock.MagicMock):
"""Tests if the _get_api_data helper returns what it should."""
-
api_data = self.home_view._get_api_data()
repo = self.home_view.repos[0]
@@ -94,7 +89,6 @@ class TestRepositoryMetadataHelpers(TestCase):
@mock.patch('requests.get', side_effect=mocked_requests_get)
def test_mocked_requests_get(self, mock_get: mock.MagicMock):
"""Tests if our mocked_requests_get is returning what it should."""
-
success_data = mock_get(HomeView.github_api)
fail_data = mock_get("failtest")
diff --git a/pydis_site/apps/home/views/home.py b/pydis_site/apps/home/views/home.py
index e4daf380..87f423aa 100644
--- a/pydis_site/apps/home/views/home.py
+++ b/pydis_site/apps/home/views/home.py
@@ -28,7 +28,6 @@ class HomeView(View):
def _get_api_data(self) -> Dict[str, Dict[str, str]]:
"""Call the GitHub API and get information about our repos."""
-
repo_dict = {repo_name: {} for repo_name in self.repos}
# Fetch the data from the GitHub API
@@ -51,7 +50,6 @@ class HomeView(View):
def _get_repo_data(self) -> List[RepositoryMetadata]:
"""Build a list of RepositoryMetadata objects that we can use to populate the front page."""
-
# Try to get site data from the cache
try:
repo_data = RepositoryMetadata.objects.get(repo_name="python-discord/site")
@@ -110,6 +108,5 @@ class HomeView(View):
def get(self, request: WSGIRequest) -> HttpResponse:
"""Collect repo data and render the homepage view"""
-
repo_data = self._get_repo_data()
return render(request, "home/index.html", {"repo_data": repo_data})
diff --git a/pydis_site/utils/resources.py b/pydis_site/utils/resources.py
index ab0df9d7..767c1ea9 100644
--- a/pydis_site/utils/resources.py
+++ b/pydis_site/utils/resources.py
@@ -10,6 +10,7 @@ import yaml
@dataclass
class URL:
"""A class representing a link to a resource"""
+
icon: str
title: str
url: str
@@ -17,6 +18,7 @@ class URL:
class Resource:
"""A class representing a resource on the resource page"""
+
description: str
name: str
payment: str
@@ -45,6 +47,7 @@ class Resource:
class Category:
"""A class representing a resource on the resources page"""
+
resources: typing.List[Resource]
name: str
description: str