diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock index 095d1acb..eeee8435 100644 --- a/backend/Pipfile.lock +++ b/backend/Pipfile.lock @@ -168,7 +168,7 @@ }, "codeforlife": { "git": "https://github.com/ocadotechnology/codeforlife-package-python.git", - "ref": "78c5b17988d899b2677f4a7d3a12408077d83351" + "ref": "143249578faf25e4163dde1e2f0be222b092b67f" }, "codeforlife-portal": { "hashes": [ @@ -806,7 +806,6 @@ "sha256:a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184", "sha256:f91456ead12ab3c6c2e9491cf33ba6d08357d802192379bb482f1033ade496f5" ], - "markers": "python_version >= '3.6'", "version": "==3.1.2" }, "pandas": { @@ -1305,7 +1304,6 @@ "sha256:6a33ee89877bd9abc1158129f6e94be74e2679636b8a205b43b85206c3f0bbdd", "sha256:f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", "version": "==2.0.1" }, "xlwt": { @@ -1514,7 +1512,7 @@ }, "codeforlife": { "git": "https://github.com/ocadotechnology/codeforlife-package-python.git", - "ref": "78c5b17988d899b2677f4a7d3a12408077d83351" + "ref": "143249578faf25e4163dde1e2f0be222b092b67f" }, "codeforlife-portal": { "hashes": [ @@ -2186,7 +2184,6 @@ "sha256:a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184", "sha256:f91456ead12ab3c6c2e9491cf33ba6d08357d802192379bb482f1033ade496f5" ], - "markers": "python_version >= '3.6'", "version": "==3.1.2" }, "packaging": { @@ -2495,6 +2492,7 @@ "sha256:c7c6ca206e93355074ae32f7403e8ea12163b1163c976fee7d4d84027c162be5", "sha256:d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42" ], + "markers": "python_version >= '3.7'", "version": "==7.2.1" }, "pytest-cov": { @@ -2897,7 +2895,6 @@ "sha256:6a33ee89877bd9abc1158129f6e94be74e2679636b8a205b43b85206c3f0bbdd", "sha256:f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", "version": "==2.0.1" }, "xlwt": { diff --git a/backend/api/fixtures/independent.json b/backend/api/fixtures/independent.json deleted file mode 100644 index 2bd37483..00000000 --- a/backend/api/fixtures/independent.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "model": "auth.user", - "pk": 28, - "fields": { - "first_name": "Indy", - "last_name": "Man", - "username": "indy@man.com", - "email": "indy@man.com", - "password": "pbkdf2_sha256$720000$Jp50WPBA6WZImUIpj3UcVm$OJWB8+UoW5lLaUkHLYo0cKgMkyRI6qnqVOWxYEsi9T0=" - } - }, - { - "model": "common.userprofile", - "pk": 28, - "fields": { - "user": 28, - "is_verified": true - } - }, - { - "model": "common.student", - "pk": 18, - "fields": { - "user": 28, - "new_user": 28 - } - } -] diff --git a/backend/api/fixtures/non_school_teacher.json b/backend/api/fixtures/non_school_teacher.json deleted file mode 100644 index bfaacaf5..00000000 --- a/backend/api/fixtures/non_school_teacher.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "model": "auth.user", - "pk": 22, - "fields": { - "first_name": "John", - "last_name": "Doe", - "username": "teacher@noschool.com", - "email": "teacher@noschool.com", - "password": "pbkdf2_sha256$720000$Jp50WPBA6WZImUIpj3UcVm$OJWB8+UoW5lLaUkHLYo0cKgMkyRI6qnqVOWxYEsi9T0=" - } - }, - { - "model": "common.userprofile", - "pk": 22, - "fields": { - "user": 22, - "is_verified": true - } - }, - { - "model": "common.teacher", - "pk": 5, - "fields": { - "user": 22, - "new_user": 22 - } - } -] \ No newline at end of file diff --git a/backend/api/fixtures/school_1.json b/backend/api/fixtures/school_1.json deleted file mode 100644 index c72454e6..00000000 --- a/backend/api/fixtures/school_1.json +++ /dev/null @@ -1,154 +0,0 @@ -[ - { - "model": "common.school", - "pk": 2, - "fields": { - "name": "School 1", - "country": "GB", - "county": "Hertfordshire" - } - }, - { - "model": "auth.user", - "pk": 23, - "fields": { - "first_name": "John", - "last_name": "Doe", - "username": "teacher@school1.com", - "email": "teacher@school1.com", - "password": "pbkdf2_sha256$720000$Jp50WPBA6WZImUIpj3UcVm$OJWB8+UoW5lLaUkHLYo0cKgMkyRI6qnqVOWxYEsi9T0=" - } - }, - { - "model": "common.userprofile", - "pk": 23, - "fields": { - "user": 23, - "is_verified": true - } - }, - { - "model": "common.teacher", - "pk": 6, - "fields": { - "user": 23, - "new_user": 23, - "school": 2 - } - }, - { - "model": "common.class", - "pk": 6, - "fields": { - "name": "Class 1 @ School 1", - "access_code": "ZZ111", - "teacher": 6 - } - }, - { - "model": "auth.user", - "pk": 27, - "fields": { - "first_name": "Student1", - "username": "111111111111111111111111111111", - "password": "pbkdf2_sha256$720000$Jp50WPBA6WZImUIpj3UcVm$OJWB8+UoW5lLaUkHLYo0cKgMkyRI6qnqVOWxYEsi9T0=" - } - }, - { - "model": "common.userprofile", - "pk": 27, - "fields": { - "user": 27, - "is_verified": true - } - }, - { - "model": "common.student", - "pk": 17, - "fields": { - "user": 27, - "new_user": 27, - "class_field": 6 - } - }, - { - "model": "auth.user", - "pk": 24, - "fields": { - "first_name": "Jane", - "last_name": "Doe", - "username": "admin.teacher@school1.com", - "email": "admin.teacher@school1.com", - "password": "pbkdf2_sha256$720000$Jp50WPBA6WZImUIpj3UcVm$OJWB8+UoW5lLaUkHLYo0cKgMkyRI6qnqVOWxYEsi9T0=" - } - }, - { - "model": "common.userprofile", - "pk": 24, - "fields": { - "user": 24, - "is_verified": true - } - }, - { - "model": "common.teacher", - "pk": 7, - "fields": { - "user": 24, - "new_user": 24, - "school": 2, - "is_admin": true - } - }, - { - "model": "common.class", - "pk": 7, - "fields": { - "name": "Class 2 @ School 1", - "access_code": "ZZ222", - "teacher": 7 - } - }, - { - "model": "common.schoolteacherinvitation", - "pk": 1, - "fields": { - "token": "pbkdf2_sha256$260000$hbsAadmrRo744BTM6NofUb$ePs/7vi6sSzOPpiWxNhXMZnNnE7aXOpzIhxrAa/rdiU=", - "school": 2, - "from_teacher": 7, - "invited_teacher_first_name": "Invited", - "invited_teacher_last_name": "Teacher", - "invited_teacher_email": "invited@teacher.com", - "invited_teacher_is_admin": false, - "expiry": "2024-02-09 20:26:08.298402+00:00" - } - }, - { - "model": "common.schoolteacherinvitation", - "pk": 2, - "fields": { - "token": "pbkdf2_sha256$260000$hbsAadmrRo744BTM6NofUb$ePs/7vi6sSzOPpiWxNhXMZnNnE7aXOpzIhxrAa/rdiU=", - "school": 2, - "from_teacher": 7, - "invited_teacher_first_name": "Invited", - "invited_teacher_last_name": "Teacher", - "invited_teacher_email": "invited@teacher.com", - "invited_teacher_is_admin": false, - "expiry": "9999-02-09 20:26:08.298402+00:00" - } - }, - { - "model": "common.schoolteacherinvitation", - "pk": 3, - "fields": { - "token": "pbkdf2_sha256$260000$hbsAadmrRo744BTM6NofUb$ePs/7vi6sSzOPpiWxNhXMZnNnE7aXOpzIhxrAa/rdiU=", - "school": 2, - "from_teacher": 7, - "invited_teacher_first_name": "Invited", - "invited_teacher_last_name": "Teacher", - "invited_teacher_email": "teacher@school1.com", - "invited_teacher_is_admin": false, - "expiry": "9999-02-09 20:26:08.298402+00:00" - } - } -] diff --git a/backend/api/fixtures/school_2.json b/backend/api/fixtures/school_2.json deleted file mode 100644 index 7e6e5dae..00000000 --- a/backend/api/fixtures/school_2.json +++ /dev/null @@ -1,104 +0,0 @@ -[ - { - "model": "common.school", - "pk": 3, - "fields": { - "name": "School 2", - "country": "GB", - "county": "Hertfordshire" - } - }, - { - "model": "auth.user", - "pk": 25, - "fields": { - "first_name": "John", - "last_name": "Doe", - "username": "teacher@school2.com", - "email": "teacher@school2.com", - "password": "pbkdf2_sha256$720000$Jp50WPBA6WZImUIpj3UcVm$OJWB8+UoW5lLaUkHLYo0cKgMkyRI6qnqVOWxYEsi9T0=" - } - }, - { - "model": "common.userprofile", - "pk": 25, - "fields": { - "user": 25, - "is_verified": true, - "otp_secret": "KI6FA34LPRQU265KQBFYS2MTDYHE2EIG" - } - }, - { - "model": "user.authfactor", - "pk": 1, - "fields": { - "user": 25, - "type": "otp" - } - }, - { - "model": "common.teacher", - "pk": 8, - "fields": { - "user": 25, - "new_user": 25, - "school": 3 - } - }, - { - "model": "common.class", - "pk": 8, - "fields": { - "name": "Class 1 @ School 2", - "access_code": "XX111", - "teacher": 8 - } - }, - { - "model": "auth.user", - "pk": 26, - "fields": { - "first_name": "Jane", - "last_name": "Doe", - "username": "admin.teacher@school2.com", - "email": "admin.teacher@school2.com", - "password": "pbkdf2_sha256$720000$Jp50WPBA6WZImUIpj3UcVm$OJWB8+UoW5lLaUkHLYo0cKgMkyRI6qnqVOWxYEsi9T0=" - } - }, - { - "model": "common.userprofile", - "pk": 26, - "fields": { - "user": 26, - "is_verified": true, - "otp_secret": "KI6FA34LPRQU265KQBFYS2MTDYHE2EIG" - } - }, - { - "model": "user.authfactor", - "pk": 2, - "fields": { - "user": 26, - "type": "otp" - } - }, - { - "model": "common.teacher", - "pk": 9, - "fields": { - "user": 26, - "new_user": 26, - "school": 3, - "is_admin": true - } - }, - { - "model": "common.class", - "pk": 9, - "fields": { - "name": "Class 2 @ School 2", - "access_code": "XX222", - "teacher": 9 - } - } -] \ No newline at end of file