feat: TNL-10136 fix build errors
blank lines in __init__ private method that needed to be public importlib and importlib-resources dependencies
This commit is contained in:
@@ -3,4 +3,3 @@ Student models migrated to folder to tease out the course enrollment aspects fro
|
||||
'''
|
||||
from .course_enrollment import *
|
||||
from .user import *
|
||||
|
||||
|
||||
@@ -295,7 +295,7 @@ def get_retired_email_by_email(email):
|
||||
return user_util.get_retired_email(email, settings.RETIRED_USER_SALTS, settings.RETIRED_EMAIL_FMT)
|
||||
|
||||
|
||||
def _get_all_retired_usernames_by_username(username):
|
||||
def get_all_retired_usernames_by_username(username):
|
||||
"""
|
||||
Returns a generator of "retired usernames", one hashed with each
|
||||
configured salt. Used for finding out if the given username has
|
||||
@@ -319,7 +319,7 @@ def get_potentially_retired_user_by_username(username):
|
||||
does not exist, then any hashed username salted with the historical
|
||||
salts.
|
||||
"""
|
||||
locally_hashed_usernames = list(_get_all_retired_usernames_by_username(username))
|
||||
locally_hashed_usernames = list(get_all_retired_usernames_by_username(username))
|
||||
locally_hashed_usernames.append(username)
|
||||
potential_users = User.objects.filter(username__in=locally_hashed_usernames)
|
||||
|
||||
@@ -364,7 +364,7 @@ def get_potentially_retired_user_by_username_and_hash(username, hashed_username)
|
||||
does not exist, the any hashed username salted with the historical
|
||||
salts.
|
||||
"""
|
||||
locally_hashed_usernames = list(_get_all_retired_usernames_by_username(username))
|
||||
locally_hashed_usernames = list(get_all_retired_usernames_by_username(username))
|
||||
|
||||
if hashed_username not in locally_hashed_usernames:
|
||||
raise Exception('Mismatched hashed_username, bad salt?')
|
||||
|
||||
@@ -15,6 +15,7 @@ from django.urls import reverse
|
||||
|
||||
from openedx.core.djangolib.testing.utils import skip_unless_lms
|
||||
from common.djangoapps.student.models import (
|
||||
get_all_retired_usernames_by_username,
|
||||
get_potentially_retired_user_by_username,
|
||||
get_potentially_retired_user_by_username_and_hash,
|
||||
get_retired_email_by_email,
|
||||
|
||||
64771
package-lock.json
generated
64771
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -34,6 +34,8 @@
|
||||
"file-loader": "1.1.6",
|
||||
"font-awesome": "4.7.0",
|
||||
"hls.js": "0.14.17",
|
||||
"importlib": "1.0.4",
|
||||
"importlib-resources": "5.10.0",
|
||||
"imports-loader": "0.7.1",
|
||||
"jest-environment-jsdom": "^26.0.0",
|
||||
"jquery": "2.2.4",
|
||||
@@ -83,6 +85,8 @@
|
||||
"eslint-config-edx": "3.0.1",
|
||||
"eslint-config-edx-es5": "2.0.0",
|
||||
"eslint-import-resolver-webpack": "0.8.4",
|
||||
"importlib": "1.0.4",
|
||||
"importlib-resources": "5.10.0",
|
||||
"jasmine-core": "2.6.4",
|
||||
"jasmine-jquery": "git+https://git@github.com/velesin/jasmine-jquery.git#ebad463d592d3fea00c69f26ea18a930e09c7b58",
|
||||
"jest": "26.0.0",
|
||||
|
||||
10
requirements.txt
Normal file
10
requirements.txt
Normal file
@@ -0,0 +1,10 @@
|
||||
attr==0.3.2
|
||||
build==0.9.0
|
||||
click==8.1.3
|
||||
importlib==1.0.4
|
||||
importlib-resources==5.10.0
|
||||
packaging==21.3
|
||||
pep517==0.13.0
|
||||
pip-tools==6.9.0
|
||||
pyparsing==3.0.9
|
||||
tomli==2.0.1
|
||||
Reference in New Issue
Block a user