Skip to content

Commit

Permalink
Merge branch 'main' into fix-active-events
Browse files Browse the repository at this point in the history
  • Loading branch information
JacobCoffee authored Sep 13, 2024
2 parents 52965bb + 241b3b8 commit 64a229f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions base-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ python-decouple==3.4
# lxml used by BeautifulSoup.
lxml==5.2.2
cssselect==1.1.0
feedparser==6.0.8
feedparser==6.0.11
beautifulsoup4==4.11.2
icalendar==4.0.7
chardet==4.0.0
Expand Down Expand Up @@ -43,7 +43,7 @@ django-waffle==2.2.1
djangorestframework==3.14.0 # 3.14.0 is first version that supports Django 4.1, 4.2 support hasnt been "released"
django-filter==2.4.0
django-ordered-model==3.4.3
django-widget-tweaks==1.4.8
django-widget-tweaks==1.5.0
django-countries==7.2.1
num2words==0.5.10
django-polymorphic==3.1.0 # 3.1.0 is first version that supports Django 4.0, unsure if it fully supports 4.2
Expand Down
3 changes: 1 addition & 2 deletions downloads/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
from django.urls import reverse
from django.test import TestCase, override_settings

from rest_framework.authtoken.models import Token
from rest_framework.test import APITestCase

from .base import BaseDownloadTests, DownloadMixin
from ..models import OS, Release
from ..models import Release
from pages.factories import PageFactory
from pydotorg.drf import BaseAPITestCase
from users.factories import UserFactory
Expand Down

0 comments on commit 64a229f

Please sign in to comment.