codeforlife-portal 8.0.4__py2.py3-none-any.whl → 8.0.5__py2.py3-none-any.whl

cfl_common/setup.py

@@ -23,7 +23,7 @@ setup(
         "django-import-export==4.2.0",
         "django-pipeline==3.1.0",
         "django-two-factor-auth==1.17.0",
-        "djangorestframework==3.15.1",
+        "djangorestframework==3.15.2",
         "libsass==0.23.0",
         "more-itertools==8.7.0",
         "pgeocode==0.4.0",

{codeforlife_portal-8.0.4.dist-info → codeforlife_portal-8.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codeforlife-portal
-Version: 8.0.4
+Version: 8.0.5
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Framework :: Django

{codeforlife_portal-8.0.4.dist-info → codeforlife_portal-8.0.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cfl_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cfl_common/setup.py,sha256=xiAuw9ktixfcoNYK_I6V7MiPY73gBQJ6gSNBhmTUxwc,978
+cfl_common/setup.py,sha256=0Bbnt2gvlq6PnI5wMZ3hPuccY-CtdKQIy5RSSmbja4U,978
 cfl_common/common/__init__.py,sha256=XlncBOpKp_gekbKH7Y_i6yu1qy5tJc3Y8sn8cDy-Vgk,48
 cfl_common/common/app_settings.py,sha256=Bw1DXkZpNIdwUJ-cIOjZnngH5_NbMXC0koW7NgQ0pKY,2495
 cfl_common/common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
@@ -108,7 +108,7 @@ example_project/portal_test_settings.py,sha256=7Q7SdosA0Ba85qz-xkAe3EHyMPpSIQ61C
 example_project/settings.py,sha256=NjFhtDNLwdY5vhUAtqk9a9m3GRfcuWRVqIqnJ3u0o6E,5658
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=8H4GfArMIlRTCgSsTERRXsD3PA6Y67z17oTQOJnuUME,22
+portal/__init__.py,sha256=obOXkQD52zgzH-mM2spS6LQ-gEWkuaiGpNTM_ISH0D8,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
@@ -548,7 +548,7 @@ portal/tests/test_school_student.py,sha256=bFZwY4twaFHQLp0cltMq8cLNDZGgCHTZBCZHK
 portal/tests/test_security.py,sha256=FGrlRfnzi-Xx2_bn4fTZlYORKm7w_GhGkD3havvplwc,3239
 portal/tests/test_teacher.py,sha256=vjnJi_aj_x48OJOMMRIBr0JTCxy4tFxqrLfCgw0fRxQ,29315
 portal/tests/test_teacher_student.py,sha256=NWITbUw1kijqu3c8eRHLHJKaYQMOsOMvl7PAVx5QghI,21567
-portal/tests/test_views.py,sha256=fBh8fZkS4p9iMEqeMgSSAcL09nH6TCohwdX4BuysxjQ,47389
+portal/tests/test_views.py,sha256=hkOxKC7oMoIsjiwVPX_HSwd2WmAQBjNbaxsz1d6FS4Y,47422
 portal/tests/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/tests/migrations/test_migration_make_portaladmin_teacher.py,sha256=ekMRb6cU97oT0k9gCKW7IUB7oPuGmv4uWJCqInQN7x8,2589
 portal/tests/migrations/test_migration_preview_user_remove.py,sha256=K6D-FZT9YFEA8oMxHz9VTglVV6MZOTRYVlvwWwXc2vU,555
@@ -631,8 +631,8 @@ portal/views/two_factor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 portal/views/two_factor/core.py,sha256=Lk32z2SN2Pg0rRkK-N-LXMvXC1kKKsH3l692kiSDQ4E,964
 portal/views/two_factor/form.py,sha256=lnHNKI-BMlpncTuW3zUzjPaJJNuEra2I_nOam0eOKFY,257
 portal/views/two_factor/profile.py,sha256=SHSg_xHccE5PtD-OfuOkYhREYz_er4bj5ro1RjJ88Yw,393
-codeforlife_portal-8.0.4.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-8.0.4.dist-info/METADATA,sha256=6f7HNSJB2IpdGzy8rNnJWVs9FIz6Sva2X1VJJm0rJtU,3078
-codeforlife_portal-8.0.4.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-codeforlife_portal-8.0.4.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.0.4.dist-info/RECORD,,
+codeforlife_portal-8.0.5.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.0.5.dist-info/METADATA,sha256=bKibW2WrX0tXBDAv7udANvAKqHi_loOgnbrA09XRh8w,3078
+codeforlife_portal-8.0.5.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+codeforlife_portal-8.0.5.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.0.5.dist-info/RECORD,,

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.0.4"
+__version__ = "8.0.5"

portal/tests/test_views.py

@@ -4,8 +4,8 @@ import json
 from datetime import date, datetime, timedelta
 from unittest.mock import ANY, Mock, patch
 
-import PyPDF2
 import pytest
+from common.mail import campaign_ids
 from common.models import (
     Class,
     DailyActivity,
@@ -16,7 +16,6 @@ from common.models import (
     UserProfile,
     UserSession,
 )
-from common.mail import campaign_ids
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import (
     create_organisation_directly,
@@ -35,6 +34,7 @@ from django.utils import timezone
 from game.models import Level
 from game.tests.utils.attempt import create_attempt
 from game.tests.utils.level import create_save_level
+from pypdf import PdfReader
 from rest_framework.test import APIClient, APITestCase
 
 from deploy import captcha
@@ -93,10 +93,10 @@ class TestTeacherViews(TestCase):
 
         # read PDF, check there's only 1 page and that the correct student details show
         with io.BytesIO(response.content) as pdf_file:
-            file_reader = PyPDF2.PdfFileReader(pdf_file)
-            assert file_reader.getNumPages() == 1
+            file_reader = PdfReader(pdf_file)
+            assert len(file_reader.pages) == 1
 
-            page_text = file_reader.getPage(0).extractText()
+            page_text = file_reader.pages[0].extract_text()
             assert NAME1 in page_text
             assert NAME2 in page_text
             assert PASSWORD1 in page_text
@@ -119,11 +119,11 @@ class TestTeacherViews(TestCase):
 
         # Check there are 2 pages and that each page contains the warning text
         with io.BytesIO(response.content) as pdf_file:
-            file_reader = PyPDF2.PdfFileReader(pdf_file)
-            assert file_reader.getNumPages() == 2
+            file_reader = PdfReader(pdf_file)
+            assert len(file_reader.pages) == 2
 
-            page1_text = file_reader.getPage(0).extractText()
-            page2_text = file_reader.getPage(1).extractText()
+            page1_text = file_reader.pages[0].extract_text()
+            page2_text = file_reader.pages[1].extract_text()
             assert REMINDER_CARDS_PDF_WARNING_TEXT in page1_text
             assert REMINDER_CARDS_PDF_WARNING_TEXT in page2_text
 
@@ -252,20 +252,24 @@ class TestTeacherViews(TestCase):
         assert response.status_code == 302
 
         student = Student.objects.get(pk=self.student.pk)
-        
+
         assert student.user.is_verified
 
         c.logout()
         c.login(username=self.email, password=self.password)
 
-        teacher = Teacher.objects.factory("the", "teacher", "theteacher@foo.com", "password")
+        teacher = Teacher.objects.factory(
+            "the", "teacher", "theteacher@foo.com", "password"
+        )
         level = Level.objects.create()
-        
+
         level.owner = student.new_user.userprofile
         level.shared_with.add(teacher.new_user)
         level.save()
 
-        students_levels = Level.objects.filter(owner=student.new_user.userprofile).all()
+        students_levels = Level.objects.filter(
+            owner=student.new_user.userprofile
+        ).all()
 
         for level in students_levels.all():
             assert level.shared_with.exists()
@@ -292,7 +296,9 @@ class TestTeacherViews(TestCase):
         student = Student.objects.get(pk=self.student.pk)
         assert not student.user.is_verified
 
-        students_levels = Level.objects.filter(owner=student.new_user.userprofile).all()
+        students_levels = Level.objects.filter(
+            owner=student.new_user.userprofile
+        ).all()
 
         for level in students_levels.all():
             assert not level.shared_with.exists()