codeforlife-portal 8.4.4__py2.py3-none-any.whl → 8.4.6__py2.py3-none-any.whl

cfl_common/setup.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import re
+import json
+import typing as t
 
 from setuptools import find_packages, setup
 
@@ -10,25 +12,46 @@ with open("../portal/__init__.py", "r") as fd:
         re.MULTILINE,
     ).group(1)
 
+
+def parse_requirements(packages: t.Dict[str, t.Dict[str, t.Any]]):
+    """Parse a group of requirements from `Pipfile.lock`.
+
+    https://setuptools.pypa.io/en/latest/userguide/dependency_management.html
+
+    Args:
+        packages: The group name of the requirements.
+
+    Returns:
+        The requirements as a list of strings, required by `setuptools.setup`.
+    """
+
+    requirements: t.List[str] = []
+    for name, package in packages.items():
+        requirement = name
+        if "extras" in package:
+            requirement += f"[{','.join(package['extras'])}]"
+        if "version" in package:
+            requirement += package["version"]
+        if "markers" in package:
+            requirement += f"; {package['markers']}"
+        requirements.append(requirement)
+
+    return requirements
+
+
+# Parse Pipfile.lock into strings.
+with open("Pipfile.lock", "r", encoding="utf-8") as pipfile_lock:
+    lock = json.load(pipfile_lock)
+    install_requires = parse_requirements(lock["default"])
+    dev_requires = parse_requirements(lock["develop"])
+
 setup(
     name="cfl-common",
     long_description="Common package for Code for Life",
     packages=find_packages(),
     version=version,
     include_package_data=True,
-    install_requires=[
-        "django==4.2.20",
-        "django-countries==7.6.1",
-        "django-csp==3.8",
-        "django-import-export==4.2.0",
-        "django-pipeline==3.1.0",
-        "django-two-factor-auth==1.17.0",
-        "djangorestframework==3.15.2",
-        "libsass==0.23.0",
-        "more-itertools==8.7.0",
-        "pgeocode==0.4.0",
-        "pyjwt==2.6.0",
-    ],
+    install_requires=install_requires,
     tests_require=[],
     test_suite="tests",
     classifiers=[

codeforlife_portal-8.4.6.dist-info/METADATA

@@ -0,0 +1,191 @@
+Metadata-Version: 2.2
+Name: codeforlife-portal
+Version: 8.4.6
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Framework :: Django
+Description-Content-Type: text/markdown
+License-File: LICENSE.md
+Requires-Dist: asgiref==3.8.1; python_version >= "3.8"
+Requires-Dist: certifi==2025.1.31; python_version >= "3.6"
+Requires-Dist: cfl-common==8.4.5
+Requires-Dist: chardet==5.2.0; python_version >= "3.7"
+Requires-Dist: charset-normalizer==3.4.1; python_version >= "3.7"
+Requires-Dist: diff-match-patch==20241021; python_version >= "3.7"
+Requires-Dist: django==4.2.20; python_version >= "3.8"
+Requires-Dist: django-classy-tags==4.1.0; python_version >= "3.8"
+Requires-Dist: django-countries==7.6.1
+Requires-Dist: django-csp==3.8
+Requires-Dist: django-formtools==2.5.1; python_version >= "3.8"
+Requires-Dist: django-import-export==4.2.0; python_version >= "3.9"
+Requires-Dist: django-otp==1.5.4; python_version >= "3.7"
+Requires-Dist: django-phonenumber-field==8.0.0; python_version >= "3.8"
+Requires-Dist: django-pipeline==3.1.0
+Requires-Dist: django-preventconcurrentlogins==0.8.2
+Requires-Dist: django-ratelimit==3.0.1; python_version >= "3.4"
+Requires-Dist: django-recaptcha==4.0.0
+Requires-Dist: django-sekizai==4.1.0; python_version >= "3.8"
+Requires-Dist: django-treebeard==4.7.1; python_version >= "3.8"
+Requires-Dist: django-two-factor-auth==1.17.0; python_version >= "3.8"
+Requires-Dist: djangorestframework==3.15.2; python_version >= "3.8"
+Requires-Dist: idna==3.10; python_version >= "3.6"
+Requires-Dist: importlib-metadata==4.13.0; python_version >= "3.7"
+Requires-Dist: libsass==0.23.0; python_version >= "3.8"
+Requires-Dist: more-itertools==8.7.0; python_version >= "3.5"
+Requires-Dist: numpy==2.2.3; python_version >= "3.10"
+Requires-Dist: pandas==2.2.3; python_version >= "3.9"
+Requires-Dist: pgeocode==0.4.0; python_version >= "3.8"
+Requires-Dist: phonenumbers==8.12.12
+Requires-Dist: pillow==11.1.0; python_version >= "3.9"
+Requires-Dist: pyjwt==2.6.0; python_version >= "3.7"
+Requires-Dist: pypng==0.20220715.0
+Requires-Dist: python-dateutil==2.9.0.post0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: pytz==2025.1
+Requires-Dist: pyyaml==6.0.2; python_version >= "3.8"
+Requires-Dist: qrcode==7.4.2; python_version >= "3.7"
+Requires-Dist: reportlab==4.2.5; python_version >= "3.7" and python_version < "4"
+Requires-Dist: requests==2.32.3; python_version >= "3.8"
+Requires-Dist: setuptools==74.0.0; python_version >= "3.8"
+Requires-Dist: six==1.17.0; python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3"
+Requires-Dist: sqlparse==0.5.3; python_version >= "3.8"
+Requires-Dist: tablib==3.7.0; python_version >= "3.9"
+Requires-Dist: typing-extensions==4.12.2; python_version >= "3.8"
+Requires-Dist: tzdata==2025.1; python_version >= "2"
+Requires-Dist: urllib3==2.3.0; python_version >= "3.9"
+Requires-Dist: zipp==3.21.0; python_version >= "3.9"
+Provides-Extra: dev
+Requires-Dist: asgiref==3.8.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: asttokens==3.0.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: attrs==25.3.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: black==25.1.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: certifi==2025.1.31; python_version >= "3.6" and extra == "dev"
+Requires-Dist: cfl-common==8.4.5; extra == "dev"
+Requires-Dist: charset-normalizer==3.4.1; python_version >= "3.7" and extra == "dev"
+Requires-Dist: click==8.1.8; python_version >= "3.7" and extra == "dev"
+Requires-Dist: coverage[toml]==7.7.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: decorator==5.2.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: diff-match-patch==20241021; python_version >= "3.7" and extra == "dev"
+Requires-Dist: django==4.2.20; python_version >= "3.8" and extra == "dev"
+Requires-Dist: django-countries==7.6.1; extra == "dev"
+Requires-Dist: django-csp==3.8; extra == "dev"
+Requires-Dist: django-formtools==2.5.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: django-import-export==4.2.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: django-otp==1.5.4; python_version >= "3.7" and extra == "dev"
+Requires-Dist: django-phonenumber-field==8.0.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: django-pipeline==3.1.0; extra == "dev"
+Requires-Dist: django-reverse-js==0.1.7; python_version >= "3.10" and extra == "dev"
+Requires-Dist: django-selenium-clean==1.0.1; extra == "dev"
+Requires-Dist: django-test-migrations==1.4.0; (python_version >= "3.9" and python_version < "4.0") and extra == "dev"
+Requires-Dist: django-two-factor-auth==1.17.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: djangorestframework==3.15.2; python_version >= "3.8" and extra == "dev"
+Requires-Dist: execnet==2.1.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: executing==2.2.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: fastdiff==0.3.0; extra == "dev"
+Requires-Dist: h11==0.14.0; python_version >= "3.7" and extra == "dev"
+Requires-Dist: idna==3.10; python_version >= "3.6" and extra == "dev"
+Requires-Dist: iniconfig==2.0.0; python_version >= "3.7" and extra == "dev"
+Requires-Dist: ipython==9.0.2; python_version >= "3.11" and extra == "dev"
+Requires-Dist: ipython-pygments-lexers==1.1.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: isort==6.0.1; python_full_version >= "3.9.0" and extra == "dev"
+Requires-Dist: jedi==0.19.2; python_version >= "3.6" and extra == "dev"
+Requires-Dist: libsass==0.23.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: matplotlib-inline==0.1.7; python_version >= "3.8" and extra == "dev"
+Requires-Dist: more-itertools==8.7.0; python_version >= "3.5" and extra == "dev"
+Requires-Dist: mypy-extensions==1.0.0; python_version >= "3.5" and extra == "dev"
+Requires-Dist: numpy==2.2.3; python_version >= "3.10" and extra == "dev"
+Requires-Dist: outcome==1.3.0.post0; python_version >= "3.7" and extra == "dev"
+Requires-Dist: packaging==24.2; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pandas==2.2.3; python_version >= "3.9" and extra == "dev"
+Requires-Dist: parso==0.8.4; python_version >= "3.6" and extra == "dev"
+Requires-Dist: pathspec==0.12.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pexpect==4.9.0; (sys_platform != "win32" and sys_platform != "emscripten") and extra == "dev"
+Requires-Dist: pgeocode==0.4.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: platformdirs==4.3.6; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pluggy==1.5.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: prompt-toolkit==3.0.50; python_full_version >= "3.8.0" and extra == "dev"
+Requires-Dist: ptyprocess==0.7.0; extra == "dev"
+Requires-Dist: pure-eval==0.2.3; extra == "dev"
+Requires-Dist: pygments==2.19.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pyhamcrest==2.0.2; python_version >= "3.5" and extra == "dev"
+Requires-Dist: pyjwt==2.6.0; python_version >= "3.7" and extra == "dev"
+Requires-Dist: pypdf==5.1.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pypng==0.20220715.0; extra == "dev"
+Requires-Dist: pysocks==1.7.1; extra == "dev"
+Requires-Dist: pytest==8.3.5; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pytest-cov==6.0.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: pytest-django==4.8.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pytest-mock==3.14.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: pytest-order==1.3.0; python_version >= "3.7" and extra == "dev"
+Requires-Dist: pytest-xdist==3.6.1; python_version >= "3.8" and extra == "dev"
+Requires-Dist: python-dateutil==2.9.0.post0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3") and extra == "dev"
+Requires-Dist: pytz==2025.1; extra == "dev"
+Requires-Dist: pyvirtualdisplay==3.0; extra == "dev"
+Requires-Dist: qrcode==7.4.2; python_version >= "3.7" and extra == "dev"
+Requires-Dist: rapid-router==7.4.1; extra == "dev"
+Requires-Dist: requests==2.32.3; python_version >= "3.8" and extra == "dev"
+Requires-Dist: responses==0.18.0; python_version >= "3.7" and extra == "dev"
+Requires-Dist: selenium==4.29.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: six==1.17.0; (python_version >= "2.7" and python_version not in "3.0, 3.1, 3.2, 3.3") and extra == "dev"
+Requires-Dist: snapshottest==1.0.0a1; extra == "dev"
+Requires-Dist: sniffio==1.3.1; python_version >= "3.7" and extra == "dev"
+Requires-Dist: sortedcontainers==2.4.0; extra == "dev"
+Requires-Dist: sqlparse==0.5.3; python_version >= "3.8" and extra == "dev"
+Requires-Dist: stack-data==0.6.3; extra == "dev"
+Requires-Dist: tablib==3.7.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: termcolor==2.5.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: traitlets==5.14.3; python_version >= "3.8" and extra == "dev"
+Requires-Dist: trio==0.29.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: trio-websocket==0.12.2; python_version >= "3.8" and extra == "dev"
+Requires-Dist: typing-extensions==4.12.2; python_version >= "3.8" and extra == "dev"
+Requires-Dist: tzdata==2025.1; python_version >= "2" and extra == "dev"
+Requires-Dist: urllib3==2.3.0; python_version >= "3.9" and extra == "dev"
+Requires-Dist: wasmer==1.1.0; extra == "dev"
+Requires-Dist: wasmer-compiler-cranelift==1.1.0; extra == "dev"
+Requires-Dist: wcwidth==0.2.13; extra == "dev"
+Requires-Dist: websocket-client==1.8.0; python_version >= "3.8" and extra == "dev"
+Requires-Dist: wsproto==1.2.0; python_full_version >= "3.7.0" and extra == "dev"
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: provides-extra
+Dynamic: requires-dist
+
+# Code for Life Portal
+
+[![Workflow Status](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml/badge.svg)](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/ocadotechnology/codeforlife-portal/branch/master/graph/badge.svg)](https://codecov.io/gh/ocadotechnology/codeforlife-portal)
+
+## LICENCE
+In accordance with the [Terms of Use](https://www.codeforlife.education/terms#terms)
+of the Code for Life website, all copyright, trademarks, and other
+intellectual property rights in and relating to Code for Life (including all
+content of the Code for Life website, the Rapid Router application, the
+Kurono application, related software (including any drawn and/or animated
+avatars, whether or not such avatars have any modifications) and any other
+games, applications or any other content that we make available from time to
+time) are owned by Ocado Innovation Limited.
+
+The source code of the Code for Life portal, the Rapid Router application
+and the Kurono/aimmo application are [licensed under the GNU Affero General
+Public License](https://github.com/ocadotechnology/codeforlife-workspace/blob/main/LICENSE.md).
+All other assets including images, logos, sounds etc., are not covered by
+this licence and no-one may copy, modify, distribute, show in public or
+create any derivative work from these assets.
+
+## Code for Life
+
+[Code for Life](https://www.codeforlife.education/) has been developed by Ocado Technology as a **free, open-source** project to inspire the next generation of computer scientists and to help teachers deliver the computing curriculum.
+
+This repository hosts the source code of the [main website](https://www.codeforlife.education/), which includes the registration, log in, teacher and student dashboards, the teaching materials, etc.
+
+We are open to contributors from anywhere around the world. Please read ahead if you'd like to get involved.
+
+## To get started
+
+- [Developer Guide](https://docs.codeforlife.education/developer-guide)
+
+- [Good First Issues](https://github.com/ocadotechnology/codeforlife-portal/contribute)
+
+- [How to set up your work environment](https://docs.codeforlife.education/git/common-setup)
+
+- [Testing](https://docs.codeforlife.education/git/testing)

{codeforlife_portal-8.4.4.dist-info → codeforlife_portal-8.4.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cfl_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cfl_common/setup.py,sha256=_jt0eA-njT6AMjkEcpNxTXOlM8vdSjurM29Q0bOWXQI,978
+cfl_common/setup.py,sha256=zjoRk8QkIeb4ZfRW6BeozmtX_6Fme913s9ntoUJrpBM,1720
 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
@@ -106,18 +106,17 @@ deploy/static/apple-touch-icon.png,sha256=QjNQ8jDKI4BpfMMsrs2t3H0fXHa5KHV45fK_VS
 deploy/static/robots.txt,sha256=5cS4RITuQhbpNzvpk4AyDCXdlIBfmfCoBYRvCHY2VT8,24
 deploy/templates/deploy/csrf_failure.html,sha256=-pBRPn4Y7nUdYHGpTHCokT9Boi-isuwuivF8V2K1SgM,412
 example_project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-example_project/manage.py,sha256=EUgybZlZ7xk2Zf2KCwBbK_z7gf7Ifqs0_bl4Kijhdgo,242
-example_project/portal_test_settings.py,sha256=mTyObCGkZEI0IQSZkqCjb1WZ7ebjQLwuiT_SykRnP6g,7315
-example_project/settings.py,sha256=pHQDI_A_yXV3u1efj689tc-vPI6nBFma4gMMPBzj0aI,5652
+example_project/portal_test_settings.py,sha256=fSjkcEWgW1bQW7wTPpiWzytPfKnlzDnI9ET6InTXI98,7342
+example_project/settings.py,sha256=b680hIHT1mtrvBjOQSli1AkDo0k3anZYHfsKhFheKlM,5684
 example_project/urls.py,sha256=FUTzHPlUS1O5kqMHjL5V4L552N2ln7uTDXcw9wjKUto,422
 example_project/wsgi.py,sha256=U1W6WzZxZaIdYZ5tks7w9fqp5WS5qvn2iThsVcskrWw,829
-portal/__init__.py,sha256=MrwcgcjFD253hhCUb3rvQPGreC9sFiXhfjgsNwRScbM,22
+portal/__init__.py,sha256=Xix7wwydRWY_pO1keDB1yg_hS-RtTMRi-x5wQ2GzTl8,22
 portal/admin.py,sha256=RKJizTF6dPJKmGPZw7nZUM0X8jkiTjgyKhLQxtvHJ0I,6148
 portal/app_settings.py,sha256=DhWLQOwM0zVOXE3O5TNKbMM9K6agfLuCsHOdr1J7xEI,651
 portal/backends.py,sha256=2Dss6_WoQwPuDzJUF1yEaTQTNG4eUrD12ujJQ5cp5Tc,812
 portal/beta.py,sha256=0TCC-9_KZoM1nuzJ9FiuKR5n9JITdMYenHGQtRvn9UU,255
 portal/context_processors.py,sha256=1TrUZqnMqGa5f7ERph9EpBqojSMJvOrcpnJzTdeCLDI,133
-portal/handlers.py,sha256=gF99OfQrGcIGDnUyONhvylZNU8sl6XHYEurwu0fuiss,422
+portal/handlers.py,sha256=TSaTIsEi-q8cwoYezw4NgVKyFy1UZkqREMipeSKA_KQ,421
 portal/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/urls.py,sha256=BWhRI-9rGEydbasI0UCtYYASqHbyUXokfepNWty7cQg,18218
 portal/wsgi.py,sha256=3yRcNxBQG30NhzrVi93bX-DrbXtsIQBc70HiW5wbOyE,401
@@ -529,27 +528,27 @@ portal/templatetags/headline_tags.py,sha256=1KHOjcVZZTLfWnxpFAUoHhIndd3RbuD1hby0
 portal/templatetags/hero_card_tags.py,sha256=nwTyPvjuaoaeG14ck8q1nbb-wSsTd6Grz3DOUCPEOMc,939
 portal/templatetags/table_tags.py,sha256=eU8kkBky_Ouq_61-6-YVu5_1zH941KRJD_Wvs_TMXqE,448
 portal/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-portal/tests/base_test.py,sha256=fepj6X-y_a1jdXi80QA6KIDV703NCJYDAVOwL6Th2fA,2459
+portal/tests/base_test.py,sha256=SxoX3UMZ8rTDHqKJFUDaUpTvPS2w7qUdOXviv6wtS1o,1649
 portal/tests/conftest.py,sha256=Rk4SOaFS22bFwNPRDOQHeNsm0We5BdEI52NTcfSlv1g,1297
 portal/tests/selenium_test_case.py,sha256=eWUF_5SqkI178bkay5SUDa06r0QTIKUUT8jTAhrdbmk,469
 portal/tests/test_2FA.py,sha256=0N4C9Ab3TvO9W__oQLCo-fLDH1Ho3CiGGsSg-2TiZUE,3597
 portal/tests/test_admin.py,sha256=AM2dgv8j9m4L-SDO-sMA9tQvQH9GwRBrlwRG9OgqtfI,1451
 portal/tests/test_api.py,sha256=Yo5s_nEGOoG35jA39yZ6nuDOUZvuCZ8o8o8XhZos61w,13819
 portal/tests/test_captcha_forms.py,sha256=Yn_VYO_6jbq6AeKeLcv-YFL1YwXZpU0C3y7SK8fRUm4,1033
-portal/tests/test_class.py,sha256=noXBXFNlV1Z5lryVH4IxMVDfh8Kb3g_GwXlu3GKPwCI,18089
+portal/tests/test_class.py,sha256=KBDHL4JdjiifY1l3-TLxOVtaCHtZrpWXU5y7xGtrq7s,18124
 portal/tests/test_emails.py,sha256=pLr06j3uMBxP1raoZQWzUTBVFvsEDFtUh85J8OnqCwE,9238
 portal/tests/test_global_forms.py,sha256=GIm_oSN4VsfaO--E2SMRu8CwVraan0UBj-_LE_tu8w0,833
 portal/tests/test_helper_methods.py,sha256=-SQCDZm2XUtyXGEp0CHIb_SSC9CPD-XOSnpnY8QclHk,890
 portal/tests/test_independent_student.py,sha256=NrRjTEr6V4WXpCE74N8LYNVocvLSvddkjuo3dYpfAZc,27245
-portal/tests/test_invite_teacher.py,sha256=gUe1spFp60v3i6kMqGoNgJd0OlBEcwplPPNYLomTJS4,12269
+portal/tests/test_invite_teacher.py,sha256=QKHWVzyd5OLpTOQ0j8p9ZF6DSCWPHcWHZwCpNTFG_6o,12320
 portal/tests/test_middleware.py,sha256=HV7AdgWyvgrtPyDMw3np5YDbUstFpKif7Qqw-e8gs5s,8258
 portal/tests/test_organisation.py,sha256=kCMUNzLN6EzaMUBcFkqXwnqLGgOuQxQWIHHt63nhqBs,7574
 portal/tests/test_partials.py,sha256=cSLNLjdsriROjPxkZlM3HKD3CSKDuKgpaDIdL3fPyBs,1794
 portal/tests/test_ratelimit.py,sha256=XWq1A9XgRrlcMHibGoJ0kc4gLc5U_u5UhKHjthxCfYA,19376
 portal/tests/test_school_student.py,sha256=bFZwY4twaFHQLp0cltMq8cLNDZGgCHTZBCZHK0JcV8s,8604
 portal/tests/test_security.py,sha256=FGrlRfnzi-Xx2_bn4fTZlYORKm7w_GhGkD3havvplwc,3239
-portal/tests/test_teacher.py,sha256=frtRdsjiwerj7KZ7jbLbSPlBgCspQ9FGFXBXy-m2gas,29351
-portal/tests/test_teacher_student.py,sha256=NWITbUw1kijqu3c8eRHLHJKaYQMOsOMvl7PAVx5QghI,21567
+portal/tests/test_teacher.py,sha256=y4h5Bt7Xlglh9pylSl1jOOl5tl6rqHTewddBjB3RzRA,29171
+portal/tests/test_teacher_student.py,sha256=4Di29Lsymbmh6WxZ0FYpqZ4fMN8NqNMTXXOsii1dfW4,21624
 portal/tests/test_views.py,sha256=Hv0rVOLmYivMqzJK1AQeRJ85YHTCRrlr12hcf1B83Bk,47566
 portal/tests/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/tests/migrations/test_migration_make_portaladmin_teacher.py,sha256=ekMRb6cU97oT0k9gCKW7IUB7oPuGmv4uWJCqInQN7x8,2589
@@ -604,7 +603,7 @@ portal/tests/snapshots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 portal/tests/snapshots/snap_test_partials.py,sha256=ErYrQezzALwvP-vrOwOVyITG67WEUpcroSdYs414fek,2481
 portal/tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/tests/utils/classes.py,sha256=MEwGTKjPRYdWiVL1V6l28NpdvRUa06yRa6PPcHT6Trc,223
-portal/tests/utils/messages.py,sha256=LeYqCEU-ubEO1lrPSAaXF6WsM8M7C-ZIfVwwlbAFT28,1769
+portal/tests/utils/messages.py,sha256=tUGzJzhZwvzmO9H3CPxpWUfi2aXTpAWfkDQ2u2T3LbA,1770
 portal/views/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 portal/views/about.py,sha256=-muXy17UhxCSKkjnMAkSLXiCvT_pBPlf2ykTYr794dI,443
 portal/views/admin.py,sha256=4Xt3zEyQH7sUwQSrwuRtoCodWidjOzd7gJUwWU96pXY,957
@@ -634,8 +633,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.4.4.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
-codeforlife_portal-8.4.4.dist-info/METADATA,sha256=Bcx9awmkGczRxQeEbFFXPhuMYgpgFhM2K8f2p43N96E,3077
-codeforlife_portal-8.4.4.dist-info/WHEEL,sha256=WDDPHYzpiOIm6GP1C2_8y8W6q16ICddAgOHlhTje9Qc,109
-codeforlife_portal-8.4.4.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
-codeforlife_portal-8.4.4.dist-info/RECORD,,
+codeforlife_portal-8.4.6.dist-info/LICENSE.md,sha256=9AbRlCDqD2D1tPibimysFv3zg3AIc49-eyv9aEsyq9w,115
+codeforlife_portal-8.4.6.dist-info/METADATA,sha256=bTwPM2n2vOxrV1stY4xhlXCZjODVeWEYZq1A_pg-ONQ,12065
+codeforlife_portal-8.4.6.dist-info/WHEEL,sha256=SrDKpSbFN1G94qcmBqS9nyHcDMp9cUS9OC06hC0G3G0,109
+codeforlife_portal-8.4.6.dist-info/top_level.txt,sha256=8e5pdsuIoTqEAMqpelHBjGjLbffcBtgOoggmd2q7nMw,41
+codeforlife_portal-8.4.6.dist-info/RECORD,,

{codeforlife_portal-8.4.4.dist-info → codeforlife_portal-8.4.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

example_project/portal_test_settings.py

@@ -6,19 +6,19 @@ from selenium import webdriver
 
 DEBUG = True
 
-headless_chrome_options = webdriver.ChromeOptions()
-headless_chrome_options.add_argument("--headless")
-headless_chrome_options.add_argument("--window-size=1920,1080")
-headless_chrome_options.add_argument("--start-maximized")
-headless_chrome_options.add_argument("--disable-gpu")
-headless_chrome_options.add_argument("--no-sandbox")
-headless_chrome_options.add_argument("--disable-extensions")
-headless_chrome_options.add_argument("--disable-dev-shm-usage")
+headless_firefox_options = webdriver.FirefoxOptions()
+headless_firefox_options.add_argument("--headless")
+headless_firefox_options.add_argument("--window-size=1920,1080")
+headless_firefox_options.add_argument("--start-maximized")
+headless_firefox_options.add_argument("--disable-gpu")
+headless_firefox_options.add_argument("--no-sandbox")
+headless_firefox_options.add_argument("--disable-extensions")
+headless_firefox_options.add_argument("--disable-dev-shm-usage")
 
 SELENIUM_WEBDRIVERS = {
-    "default": {"callable": webdriver.Chrome, "args": (), "kwargs": {}},
-    "firefox": {"callable": webdriver.Firefox, "args": (), "kwargs": {}},
-    "chrome-headless": {"callable": webdriver.Chrome, "args": (), "kwargs": {"options": headless_chrome_options}},
+    "default": {"callable": webdriver.Firefox, "args": (), "kwargs": {}},
+    "chrome": {"callable": webdriver.Chrome, "args": (), "kwargs": {}},
+    "firefox-headless": {"callable": webdriver.Firefox, "args": (), "kwargs": {"options": headless_firefox_options}},
 }
 
 SELENIUM_WIDTHS = [1624]
@@ -74,7 +74,7 @@ STATIC_URL = "/static/"
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "portal/static")]
 MEDIA_ROOT = os.path.join(STATIC_ROOT, "email_media/")
 
-WSGI_APPLICATION = "wsgi.application"
+WSGI_APPLICATION = "example_project.wsgi.application"
 
 LOGIN_REDIRECT_URL = "/teach/dashboard/"
 

example_project/settings.py

@@ -26,11 +26,11 @@ STATICFILES_DIRS = [os.path.join(BASE_DIR, "portal/static")]
 MEDIA_ROOT = os.path.join(STATIC_ROOT, "email_media/")
 SECRET_KEY = "not-a-secret"
 
-ROOT_URLCONF = "urls"
+ROOT_URLCONF = "example_project.urls"
 
 ALLOWED_HOSTS = ["*"]
 
-WSGI_APPLICATION = "wsgi.application"
+WSGI_APPLICATION = "example_project.wsgi.application"
 
 LOGIN_REDIRECT_URL = "/teach/dashboard/"
 

portal/__init__.py

@@ -1 +1 @@
-__version__ = "8.4.4"
+__version__ = "8.4.6"

portal/handlers.py

@@ -1,10 +1,9 @@
+from common.utils import two_factor_cache_key
 from django.core.cache import cache
 from django.db.models.signals import post_save, pre_delete
 from django.dispatch import receiver
 from django_otp.models import Device
 
-from common.utils import two_factor_cache_key
-
 
 @receiver([post_save, pre_delete])
 def clear_two_factor_cache(sender, **kwargs):

portal/tests/base_test.py

@@ -5,30 +5,9 @@ from django.contrib.sites.models import Site
 from django.urls import reverse
 
 from deploy import captcha
-
-# Uncomment to use FireFox
-# master_browser = webdriver.Firefox()
 from portal.tests.pageObjects.portal.home_page import HomePage
 from .selenium_test_case import SeleniumTestCase
 
-from selenium.webdriver.common.action_chains import ActionChains
-from selenium.webdriver.common.by import By
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support import expected_conditions as EC
-
-
-def button_click_handler(page, self, button_element):
-    current_button = WebDriverWait(self.selenium, 20).until(EC.presence_of_element_located((By.ID, button_element)))
-    ActionChains(self.selenium).move_to_element(current_button).click(current_button).perform()
-
-
-def click_buttons_by_id(page, self, button_ids):
-    if isinstance(button_ids, str):
-        button_click_handler(page, self, button_ids)
-    else:
-        for button_id in button_ids:
-            button_click_handler(page, self, button_id)
-
 
 class BaseTest(SeleniumTestCase):
     @classmethod

portal/tests/test_class.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import
 
+import time
 from datetime import datetime, timedelta
 
 from common.models import Class, DailyActivity, Teacher
@@ -550,6 +551,8 @@ class TestClassFrontend(BaseTest):
 
         page = page.create_class(class_name, False)
 
+        time.sleep(1)
+
         assert page.was_form_invalid(
             "form-create-class", "Class name may only contain letters, numbers, dashes, underscores, and spaces."
         )

portal/tests/test_invite_teacher.py

@@ -16,7 +16,7 @@ from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.wait import WebDriverWait
 
-from portal.tests.base_test import BaseTest, click_buttons_by_id
+from portal.tests.base_test import BaseTest
 
 FADE_TIME = 0.9
 WAIT_TIME = 15
@@ -185,7 +185,7 @@ class TestTeacherInviteActions(BaseTest):
             field.send_keys(invite_data[key])
 
         # check if invite text for a user has been generated
-        click_buttons_by_id(page, self, "invite_teacher_button")
+        page.browser.find_element(By.ID, "invite_teacher_button").click()
         banner = page.browser.find_element(By.ID, "messages")
         assert (
             f"You have invited {invite_data['teacher_first_name']} {invite_data['teacher_last_name']} to your school."
@@ -194,14 +194,17 @@ class TestTeacherInviteActions(BaseTest):
 
         # check if popup message appears and if the invite is changed to admin
         sleep(1)  # this HAS to be there because of the animation :/
-        click_buttons_by_id(page, self, ["make_admin_button_invite", "add_admin_button"])
+        page.browser.find_element(By.ID, "make_admin_button_invite").click()
+        sleep(1)
+        page.browser.find_element(By.ID, "add_admin_button").click()
+
         invite = SchoolTeacherInvitation.objects.filter(invited_teacher_first_name="Adam")[0]
         assert invite.invited_teacher_is_admin
         banner = page.browser.find_element(By.ID, "messages")
         assert "Administrator invite status has been given successfully" in banner.text
 
         # revoke admin
-        click_buttons_by_id(page, self, "make_non_admin_button_invite")
+        page.browser.find_element(By.ID, "make_non_admin_button_invite").click()
 
         banner = page.browser.find_element(By.ID, "messages")
         assert "Administrator invite status has been revoked successfully" in banner.text
@@ -220,8 +223,7 @@ class TestTeacherInviteActions(BaseTest):
         for key in invite_data.keys():
             field = page.browser.find_element(By.NAME, key)
             field.send_keys(invite_data[key])
-        invite_button = page.browser.find_element(By.NAME, "invite_teacher_button")
-        invite_button.click()
+        page.browser.find_element(By.NAME, "invite_teacher_button").click()
 
         # check object was created
         invite_queryset = SchoolTeacherInvitation.objects.filter(invited_teacher_first_name="Adam")
@@ -251,7 +253,7 @@ class TestTeacherInviteActions(BaseTest):
             field = page.browser.find_element(By.NAME, key)
             field.send_keys(invite_data[key])
 
-        click_buttons_by_id(page, self, "invite_teacher_button")
+        page.browser.find_element(By.ID, "invite_teacher_button").click()
 
         banner = page.browser.find_element(By.XPATH, '//*[@id="messages"]/div/div/div/div/div/p')
         assert (
@@ -260,7 +262,7 @@ class TestTeacherInviteActions(BaseTest):
         )
 
         # resend an invite
-        click_buttons_by_id(page, self, "resend-invite")
+        page.browser.find_element(By.ID, "resend-invite").click()
 
         # check if invite was updated by 30 days (used 29 for rounding errors)
         new_invite_expiry = SchoolTeacherInvitation.objects.filter(invited_teacher_first_name="Adam")[0].expiry

portal/tests/test_teacher.py

@@ -33,9 +33,7 @@ from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.wait import WebDriverWait
 
 from portal.forms.error_messages import INVALID_LOGIN_MESSAGE
-from portal.tests.base_test import click_buttons_by_id
 from portal.tests.test_invite_teacher import WAIT_TIME
-
 from .base_test import BaseTest
 from .pageObjects.portal.home_page import HomePage
 from .utils.messages import (
@@ -644,25 +642,13 @@ class TestTeacherFrontend(BaseTest):
             field = page.browser.find_element(By.NAME, key)
             field.send_keys(invite_data[key])
 
-        invite_button = page.browser.find_element(
-            By.NAME, "invite_teacher_button"
-        )
-        invite_button.click()
-
+        page.browser.find_element(By.NAME, "invite_teacher_button").click()
         # Once invite sent test the make admin button
-        """
-        make_admin_button = WebDriverWait(self.selenium, WAIT_TIME).until(
-            EC.element_to_be_clickable((By.ID, "make_admin_button_invite"))
-        )
-        make_admin_button.click()
-        """
-
-        button_ids = [
-            "make_admin_button_invite",
-            "cancel_admin_popup_button",
-            "delete-invite",
-        ]
-        click_buttons_by_id(page, self, button_ids)
+        page.browser.find_element(By.ID, "make_admin_button_invite").click()
+        time.sleep(1)
+        page.browser.find_element(By.ID, "cancel_admin_popup_button").click()
+        time.sleep(1)
+        page.browser.find_element(By.ID, "delete-invite").click()
 
         # Delete the invite and check if the form invite with
         # admin checked also makes a popup
@@ -673,17 +659,16 @@ class TestTeacherFrontend(BaseTest):
         checkbox = page.browser.find_element(By.NAME, "make_admin_ticked")
         checkbox.click()
 
-        button_ids = ["invite_teacher_button", "cancel_admin_popup_button"]
-
-        click_buttons_by_id(page, self, button_ids)
+        page.browser.find_element(By.ID, "invite_teacher_button").click()
+        time.sleep(1)
+        page.browser.find_element(By.ID, "cancel_admin_popup_button").click()
 
         # Non admin teacher joined - make admin should also make a popup
-
         join_teacher_to_organisation(joining_email, school.name)
 
         # refresh the page and scroll to the buttons
-        page.browser.execute_script("location.reload()")
-        click_buttons_by_id(page, self, "make_admin_button")
+        page.browser.find_element(By.CSS_SELECTOR, ".logo").click()
+        page.browser.find_element(By.ID, "make_admin_button").click()
 
         assert page.element_exists((By.CLASS_NAME, "popup-box__msg"))
 
@@ -795,6 +780,8 @@ class TestTeacherFrontend(BaseTest):
             .complete_setup()
         )
 
+        time.sleep(1)
+
         assert page.has_onboarding_complete_popup()
 
     def get_to_forgotten_password_page(self):

portal/tests/test_teacher_student.py

@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import json
+import time
 from unittest.mock import Mock, patch
 
 import pytest
@@ -24,7 +25,6 @@ from selenium.webdriver.common.alert import Alert
 from selenium.webdriver.common.by import By
 
 from portal.tests.pageObjects.portal.home_page import HomePage
-
 from .base_test import BaseTest
 
 
@@ -146,6 +146,8 @@ class TestTeacherStudentFrontend(BaseTest):
             .import_students_from_csv("test_students_names_no_name.csv")
         )
 
+        time.sleep(1)
+
         alert = Alert(page.browser)
         assert alert.text == "'Name' column not found in CSV file."
         alert.dismiss()
@@ -184,6 +186,8 @@ class TestTeacherStudentFrontend(BaseTest):
             .import_students_from_csv("test_students_names_no_name.csv")
         )
 
+        time.sleep(1)
+
         alert = Alert(page.browser)
         assert alert.text == "'Name' column not found in CSV file."
         alert.dismiss()

portal/tests/utils/messages.py

@@ -1,5 +1,6 @@
 from selenium.webdriver.common.by import By
 
+
 def is_message_showing(browser, message):
     return message in browser.find_element(By.ID, "messages").text
 

codeforlife_portal-8.4.4.dist-info/METADATA

@@ -1,62 +0,0 @@
-Metadata-Version: 2.1
-Name: codeforlife-portal
-Version: 8.4.4
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Framework :: Django
-Description-Content-Type: text/markdown
-License-File: LICENSE.md
-Requires-Dist: django-recaptcha==4.0.0
-Requires-Dist: pyyaml==6.0.2
-Requires-Dist: importlib-metadata==4.13.0
-Requires-Dist: reportlab==4.2.5
-Requires-Dist: django-formtools==2.5.1
-Requires-Dist: django-otp==1.5.4
-Requires-Dist: requests==2.32.2
-Requires-Dist: django-treebeard==4.7.1
-Requires-Dist: django-sekizai==4.1.0
-Requires-Dist: django-classy-tags==4.1.0
-Requires-Dist: phonenumbers==8.12.12
-Requires-Dist: django-ratelimit==3.0.1
-Requires-Dist: django-preventconcurrentlogins==0.8.2
-Requires-Dist: setuptools==74.0.0
-
-# Code for Life Portal
-
-[![Workflow Status](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml/badge.svg)](https://github.com/ocadotechnology/codeforlife-portal/actions/workflows/ci.yml)
-[![codecov](https://codecov.io/gh/ocadotechnology/codeforlife-portal/branch/master/graph/badge.svg)](https://codecov.io/gh/ocadotechnology/codeforlife-portal)
-
-## LICENCE
-In accordance with the [Terms of Use](https://www.codeforlife.education/terms#terms)
-of the Code for Life website, all copyright, trademarks, and other
-intellectual property rights in and relating to Code for Life (including all
-content of the Code for Life website, the Rapid Router application, the
-Kurono application, related software (including any drawn and/or animated
-avatars, whether or not such avatars have any modifications) and any other
-games, applications or any other content that we make available from time to
-time) are owned by Ocado Innovation Limited.
-
-The source code of the Code for Life portal, the Rapid Router application
-and the Kurono/aimmo application are [licensed under the GNU Affero General
-Public License](https://github.com/ocadotechnology/codeforlife-workspace/blob/main/LICENSE.md).
-All other assets including images, logos, sounds etc., are not covered by
-this licence and no-one may copy, modify, distribute, show in public or
-create any derivative work from these assets.
-
-## Code for Life
-
-[Code for Life](https://www.codeforlife.education/) has been developed by Ocado Technology as a **free, open-source** project to inspire the next generation of computer scientists and to help teachers deliver the computing curriculum.
-
-This repository hosts the source code of the [main website](https://www.codeforlife.education/), which includes the registration, log in, teacher and student dashboards, the teaching materials, etc.
-
-We are open to contributors from anywhere around the world. Please read ahead if you'd like to get involved.
-
-## To get started
-
-- [Developer Guide](https://docs.codeforlife.education/developer-guide)
-
-- [Good First Issues](https://github.com/ocadotechnology/codeforlife-portal/contribute)
-
-- [How to set up your work environment](https://docs.codeforlife.education/git/common-setup)
-
-- [Testing](https://docs.codeforlife.education/git/testing)

example_project/manage.py

@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)