From 076bace05d51009c9369fb1b5d77ed1f78c8d7d6 Mon Sep 17 00:00:00 2001 From: faucomte97 Date: Tue, 21 Nov 2023 17:08:43 +0000 Subject: [PATCH 1/2] fix: Revert Django to 3.2.22 (CI/CD measuring) --- Pipfile.lock | 138 +++++++++++++++++++++++++-------------------------- setup.py | 2 +- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 1b41ba6f2..923085d75 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -40,18 +40,18 @@ }, "certifi": { "hashes": [ - "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082", - "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9" + "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1", + "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474" ], "markers": "python_version >= '3.6'", - "version": "==2023.7.22" + "version": "==2023.11.17" }, "cfl-common": { "hashes": [ - "sha256:09fe5bb52f3e17e6a35595f8ee77085616869045833bd27a771e007070586477", - "sha256:cab6412b30cd31385bb6344f1006d39c311190941ac8372d2bc6e432ab54916f" + "sha256:b97a19f1aab073c9dc447249a6501b433ac3cea81052b5a2afe232ceb398ccb9", + "sha256:e45b4772b4a7234321cfe8c6ddbf185b4756970782f384f052a6b5298f4ed991" ], - "version": "==6.37.4" + "version": "==6.39.6" }, "charset-normalizer": { "hashes": [ @@ -175,11 +175,11 @@ }, "django": { "hashes": [ - "sha256:82968f3640e29ef4a773af2c28448f5f7a08d001c6ac05b32d02aeee6509508b", - "sha256:d48608d5f62f2c1e260986835db089fa3b79d6f58510881d316b8d88345ae6e1" + "sha256:83b6d66b06e484807d778263fdc7f9186d4dc1862fcfa6507830446ac6b060ba", + "sha256:c5e7b668025a6e06cad9ba6d4de1fd1a21212acebb51ea34abb400c6e4d33430" ], "markers": "python_version >= '3.6'", - "version": "==3.2.23" + "version": "==3.2.22" }, "django-countries": { "hashes": [ @@ -205,11 +205,11 @@ }, "django-import-export": { "hashes": [ - "sha256:88ecaf06be06bd95d97cf34f3c911c56c012a7a81712a8956740e5bfc2465162", - "sha256:d02e31908c965d512cc6f7ef6e72935177647b15d3846050d0f094177fca0d86" + "sha256:2c1b16e1cf2ea5f62a165d8867e7c6dcff25673ab7201fd18aaf67c9ee90367e", + "sha256:78973202e93897326ab0411d64eaf89b72779fcb21ee9e5f64f3fb96571a5978" ], "index": "pypi", - "version": "==3.3.1" + "version": "==3.3.3" }, "django-js-reverse": { "hashes": [ @@ -220,11 +220,11 @@ }, "django-otp": { "hashes": [ - "sha256:5ddd1aaf455db47fac3ce0d8b518e68e9a57db55e30ad68eafad377e4fa741f5", - "sha256:7e805cc196cbac93edbbbbf5078d7c5156fec2dba1b2589361ddbf74c4557e39" + "sha256:5277731bc05b6cdbf96aa84ac46018e30ed5fb248086053b0146f925de059060", + "sha256:8f4156a3c14ce2aaa31379385eadf388925cd50fc4b5d20a3b944f454c98ff7c" ], "markers": "python_version >= '3.7'", - "version": "==1.2.4" + "version": "==1.3.0" }, "django-phonenumber-field": { "hashes": [ @@ -441,11 +441,11 @@ }, "prompt-toolkit": { "hashes": [ - "sha256:04505ade687dc26dc4284b1ad19a83be2f2afe83e7a828ace0c72f3a1df72aac", - "sha256:9dffbe1d8acf91e3de75f3b544e4842382fc06c6babe903ac9acb74dc6e08d88" + "sha256:941367d97fc815548822aa26c2a269fdc4eb21e9ec05fc5d447cf09bad5d75f0", + "sha256:f36fe301fafb7470e86aaf90f036eef600a3210be4decf461a5b1ca8403d3cb2" ], "markers": "python_full_version >= '3.7.0'", - "version": "==3.0.39" + "version": "==3.0.41" }, "ptyprocess": { "hashes": [ @@ -463,11 +463,11 @@ }, "pygments": { "hashes": [ - "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692", - "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29" + "sha256:1b37f1b1e1bff2af52ecaf28cc601e2ef7077000b227a0675da25aef85784bc4", + "sha256:e45a0e74bf9c530f564ca81b8952343be986a29f6afe7f5ad95c5f06b7bdf5e8" ], "markers": "python_version >= '3.7'", - "version": "==2.16.1" + "version": "==2.17.1" }, "pyhamcrest": { "hashes": [ @@ -646,18 +646,18 @@ }, "urllib3": { "hashes": [ - "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84", - "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e" + "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3", + "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54" ], - "markers": "python_version >= '3.7'", - "version": "==2.0.7" + "markers": "python_version >= '3.8'", + "version": "==2.1.0" }, "wcwidth": { "hashes": [ - "sha256:9a929bd8380f6cd9571a968a9c8f4353ca58d7cd812a4822bba831f8d685b223", - "sha256:a675d1a4a2d24ef67096a04b85b02deeecd8e226f57b5e3a72dbb9ed99d27da8" + "sha256:25eb3ecbec328cdb945f56f2a7cfe784bdf7a73a8197398c7a7c65e7fe93e9ae", + "sha256:c4b153acf29f1f0d7fb1b00d097cce82b73de7a2016321c8d7ca71bd76dd848b" ], - "version": "==0.2.9" + "version": "==0.2.11" }, "xlrd": { "hashes": [ @@ -677,10 +677,10 @@ "develop": { "aimmo": { "hashes": [ - "sha256:a7cb6ff0405892d41e48023b407c8541f9d2210a8a35d1fc199eadc0e92bc25a", - "sha256:e12177cbac79232621e6d88f412e6d5f8289df9a1b391930e20fba8c43f05910" + "sha256:1c4e9ea558c083b8f59b365d1f1dfd6d94e8aee863ea96dcaeec488fd72541f8", + "sha256:4c8d20c738e4a4443ca98e03621b96c5c79309f4f817faf3aaf731380c621d8a" ], - "version": "==2.10.8" + "version": "==2.10.12" }, "asgiref": { "hashes": [ @@ -708,18 +708,18 @@ }, "certifi": { "hashes": [ - "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082", - "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9" + "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1", + "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474" ], "markers": "python_version >= '3.6'", - "version": "==2023.7.22" + "version": "==2023.11.17" }, "cfl-common": { "hashes": [ - "sha256:09fe5bb52f3e17e6a35595f8ee77085616869045833bd27a771e007070586477", - "sha256:cab6412b30cd31385bb6344f1006d39c311190941ac8372d2bc6e432ab54916f" + "sha256:b97a19f1aab073c9dc447249a6501b433ac3cea81052b5a2afe232ceb398ccb9", + "sha256:e45b4772b4a7234321cfe8c6ddbf185b4756970782f384f052a6b5298f4ed991" ], - "version": "==6.37.4" + "version": "==6.39.6" }, "charset-normalizer": { "hashes": [ @@ -819,11 +819,11 @@ }, "codeforlife-portal": { "hashes": [ - "sha256:cb393cf7f8b6f552afeaa6926fac55399a57cb80febed9bfcc923b6d41f2c166", - "sha256:ded940d91a13a0971a146b98dde1d49d5df711dfac30674d5e0391bc26b2efa3" + "sha256:4c57475a3ee6ef66ffec3bdee6637659d5d6ccd7c59c7735842d43242b057e61", + "sha256:f1299b83ffb963a3abe4770fcd45e8b7d01fd6ac318d4e0c3d315164a530e5ae" ], "index": "pypi", - "version": "==6.37.3" + "version": "==6.39.5" }, "defusedxml": { "hashes": [ @@ -843,11 +843,11 @@ }, "django": { "hashes": [ - "sha256:82968f3640e29ef4a773af2c28448f5f7a08d001c6ac05b32d02aeee6509508b", - "sha256:d48608d5f62f2c1e260986835db089fa3b79d6f58510881d316b8d88345ae6e1" + "sha256:83b6d66b06e484807d778263fdc7f9186d4dc1862fcfa6507830446ac6b060ba", + "sha256:c5e7b668025a6e06cad9ba6d4de1fd1a21212acebb51ea34abb400c6e4d33430" ], "markers": "python_version >= '3.6'", - "version": "==3.2.23" + "version": "==3.2.22" }, "django-classy-tags": { "hashes": [ @@ -880,11 +880,11 @@ }, "django-import-export": { "hashes": [ - "sha256:88ecaf06be06bd95d97cf34f3c911c56c012a7a81712a8956740e5bfc2465162", - "sha256:d02e31908c965d512cc6f7ef6e72935177647b15d3846050d0f094177fca0d86" + "sha256:2c1b16e1cf2ea5f62a165d8867e7c6dcff25673ab7201fd18aaf67c9ee90367e", + "sha256:78973202e93897326ab0411d64eaf89b72779fcb21ee9e5f64f3fb96571a5978" ], "index": "pypi", - "version": "==3.3.1" + "version": "==3.3.3" }, "django-js-reverse": { "hashes": [ @@ -895,11 +895,11 @@ }, "django-otp": { "hashes": [ - "sha256:5ddd1aaf455db47fac3ce0d8b518e68e9a57db55e30ad68eafad377e4fa741f5", - "sha256:7e805cc196cbac93edbbbbf5078d7c5156fec2dba1b2589361ddbf74c4557e39" + "sha256:5277731bc05b6cdbf96aa84ac46018e30ed5fb248086053b0146f925de059060", + "sha256:8f4156a3c14ce2aaa31379385eadf388925cd50fc4b5d20a3b944f454c98ff7c" ], "markers": "python_version >= '3.7'", - "version": "==1.2.4" + "version": "==1.3.0" }, "django-phonenumber-field": { "hashes": [ @@ -1005,11 +1005,11 @@ }, "exceptiongroup": { "hashes": [ - "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9", - "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3" + "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14", + "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68" ], "markers": "python_version < '3.11'", - "version": "==1.1.3" + "version": "==1.2.0" }, "execnet": { "hashes": [ @@ -1351,11 +1351,11 @@ }, "pyasn1": { "hashes": [ - "sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57", - "sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde" + "sha256:4439847c58d40b1d0a573d07e3856e95333f1976294494c325775aeca506eb58", + "sha256:6d391a96e59b23130a5cfa74d6fd7f388dbbe26cc8f1edf39fdddf08d9d6676c" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==0.5.0" + "version": "==0.5.1" }, "pyasn1-modules": { "hashes": [ @@ -1414,19 +1414,19 @@ }, "pytest-order": { "hashes": [ - "sha256:139d25b30826b78eebb42722f747eab14c44b88059d7a71d4f79d14a057269a5", - "sha256:3b3730969c97900fa5cd31ecff80847680ed56b2490954565c14949ba60d9371" + "sha256:944f86b6d441aa7b1da80f801c6ab65b84bbeba472d0a7a12eb43ba26650101a", + "sha256:9d65c3b6dc6d6ee984d6ae2c6c4aa4f1331e5b915116219075c888c8bcbb93b8" ], "index": "pypi", - "version": "==1.1.0" + "version": "==1.2.0" }, "pytest-xdist": { "hashes": [ - "sha256:d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93", - "sha256:ff9daa7793569e6a68544850fd3927cd257cc03a7ef76c95e86915355e82b5f2" + "sha256:cbb36f3d67e0c478baa57fa4edc8843887e0f6cfc42d677530a36d7472b32d8a", + "sha256:d075629c7e00b611df89f490a5063944bee7a4362a5ff11c7cc7824a03dfce24" ], "index": "pypi", - "version": "==3.3.1" + "version": "==3.5.0" }, "python-dateutil": { "hashes": [ @@ -1657,11 +1657,11 @@ }, "trio": { "hashes": [ - "sha256:3887cf18c8bcc894433420305468388dac76932e9668afa1c49aa3806b6accb3", - "sha256:f43da357620e5872b3d940a2e3589aa251fd3f881b65a608d742e00809b1ec38" + "sha256:16f89f7dcc8f7b9dcdec1fcd863e0c039af6d0f9a22f8dfd56f75d75ec73fd48", + "sha256:bb4abb3f4af23f96679e7c8cdabb8b234520f2498550d2cf63ebfd95f2ce27fe" ], - "markers": "python_version >= '3.7'", - "version": "==0.22.2" + "markers": "python_version >= '3.8'", + "version": "==0.23.1" }, "trio-websocket": { "hashes": [ @@ -1689,11 +1689,11 @@ }, "urllib3": { "hashes": [ - "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84", - "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e" + "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3", + "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54" ], - "markers": "python_version >= '3.7'", - "version": "==2.0.7" + "markers": "python_version >= '3.8'", + "version": "==2.1.0" }, "websocket-client": { "hashes": [ diff --git a/setup.py b/setup.py index 39d390841..de8c43176 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ packages=find_packages(), include_package_data=True, install_requires=[ - "django==3.2.23", + "django==3.2.22", "django-csp==3.7", "django-js-reverse==0.9.1", "django-pipeline==2.0.8", From 04a79e69f479643af9b630d26aa3c41b5403342e Mon Sep 17 00:00:00 2001 From: faucomte97 Date: Tue, 21 Nov 2023 17:17:49 +0000 Subject: [PATCH 2/2] Update tests --- game/tests/test_level_moderation.py | 2 +- game/tests/utils/teacher.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/game/tests/test_level_moderation.py b/game/tests/test_level_moderation.py index 85781d7d4..55cdb15f1 100644 --- a/game/tests/test_level_moderation.py +++ b/game/tests/test_level_moderation.py @@ -109,7 +109,7 @@ def test_moderation_admin(self): email1, password1 = signup_teacher_directly() email2, password2 = signup_teacher_directly() school = create_organisation_directly(email1) - join_teacher_to_organisation(email2, school.name, school.postcode) + join_teacher_to_organisation(email2, school.name) # Create one class and student for each teacher _, class_name1, access_code1 = create_class_directly(email1) diff --git a/game/tests/utils/teacher.py b/game/tests/utils/teacher.py index 6164cc9e5..ce816bdcb 100644 --- a/game/tests/utils/teacher.py +++ b/game/tests/utils/teacher.py @@ -7,7 +7,6 @@ def create_school() -> School: school = School() school.name = "".join(random.choice(string.ascii_uppercase) for _ in range(10)) - school.postcode = "".join(random.choice(string.ascii_uppercase) for _ in range(7)) school.country = "United Kingdom" school.save()