Skip to content

Commit

Permalink
Updating Python Requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthugs
Matt Hughes authored and matthugs committed Jul 8, 2021
1 parent 714de7b commit 9c25a04
Show file tree
Hide file tree
Showing 11 changed files with 162 additions and 155 deletions.
14 changes: 7 additions & 7 deletions edx_proctoring/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,12 +308,12 @@ def has_delete_permission(self, request, obj=None):
""" Allow deletes """
return True

def save_model(self, request, review, form, change): # pylint: disable=arguments-differ
def save_model(self, request, obj, form, change):
"""
Override callback so that we can inject the user_id that made the change
"""
review.reviewed_by = request.user
review.save()
obj.reviewed_by = request.user
obj.save()

def get_form(self, request, obj=None, change=False, **kwargs):
""" Returns software secure review form """
Expand All @@ -322,11 +322,11 @@ def get_form(self, request, obj=None, change=False, **kwargs):
del form.base_fields['video_url']
return form

def lookup_allowed(self, key, value): # pylint: disable=arguments-differ
def lookup_allowed(self, lookup, value):
""" Checks if lookup allowed or not """
if key == 'exam__course_id':
if lookup == 'exam__course_id':
return True
return super().lookup_allowed(key, value)
return super().lookup_allowed(lookup, value)


class ProctoredExamSoftwareSecureReviewHistoryAdmin(ProctoredExamSoftwareSecureReviewAdmin):
Expand All @@ -344,7 +344,7 @@ class ProctoredExamSoftwareSecureReviewHistoryAdmin(ProctoredExamSoftwareSecureR
'modified',
]

def save_model(self, request, review, form, change):
def save_model(self, request, obj, form, change): # pylint: disable=unused-argument
"""
History can't be updated
"""
Expand Down
2 changes: 1 addition & 1 deletion edx_proctoring/backends/rest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def get_javascript(self):
Returns the url of the javascript bundle into which the provider's JS will be loaded
"""
# use the defined npm_module name, or else the python package name
package = getattr(self, 'npm_module', self.__class__.__module__.split('.')[0])
package = getattr(self, 'npm_module', self.__class__.__module__.split('.', maxsplit=1)[0])
js_url = ''
try:
bundle_chunks = get_files(package, config="WORKERS")
Expand Down
52 changes: 27 additions & 25 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
Expand All @@ -20,21 +20,35 @@ cffi==1.14.5
# via cryptography
chardet==4.0.0
# via requests
click-didyoumean==0.0.3
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
click==7.1.2
# via
# -c requirements/constraints.txt
# celery
# click-didyoumean
# click-plugins
# click-repl
click-didyoumean==0.0.3
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.2.0
# via celery
cryptography==3.4.7
# via pyjwt
django==2.2.24
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
# django-crum
# django-model-utils
# djangorestframework
# drf-jwt
# edx-django-utils
# edx-drf-extensions
# edx-when
# event-tracking
# jsonfield2
# rest-condition
django-crum==0.7.9
# via
# -r requirements/base.in
Expand All @@ -50,22 +64,10 @@ django-waffle==2.2.0
# -r requirements/base.in
# edx-django-utils
# edx-drf-extensions
django-webpack-loader==1.0.0
# via -r requirements/base.in
django==2.2.24
django-webpack-loader==0.7.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-crum
# django-model-utils
# djangorestframework
# drf-jwt
# edx-django-utils
# edx-drf-extensions
# edx-when
# event-tracking
# jsonfield2
# rest-condition
djangorestframework==3.12.4
# via
# -r requirements/base.in
Expand All @@ -85,7 +87,7 @@ edx-drf-extensions==6.5.0
# via
# -r requirements/base.in
# edx-when
edx-opaque-keys==2.2.1
edx-opaque-keys==2.2.2
# via
# -r requirements/base.in
# edx-drf-extensions
Expand All @@ -112,11 +114,11 @@ lxml==4.6.3
# via xblock
markupsafe==2.0.1
# via xblock
newrelic==6.4.1.158
newrelic==6.4.4.161
# via edx-django-utils
pbr==5.6.0
# via stevedore
prompt-toolkit==3.0.18
prompt-toolkit==3.0.19
# via click-repl
psutil==5.8.0
# via edx-django-utils
Expand Down Expand Up @@ -181,7 +183,7 @@ stevedore==3.3.0
# via
# edx-django-utils
# edx-opaque-keys
urllib3==1.26.5
urllib3==1.26.6
# via requests
vine==5.0.0
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/celery50.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
amqp==5.0.6
billiard==3.6.4.0
celery==5.0.4
click==7.1.2
click-didyoumean==0.0.3
click-repl==0.2.0
click==7.1.2
kombu==5.1.0
prompt-toolkit==3.0.18
prompt-toolkit==3.0.19
vine==5.0.0
10 changes: 5 additions & 5 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
Expand All @@ -22,7 +22,7 @@ filelock==3.0.12
# virtualenv
idna==2.10
# via requests
packaging==20.9
packaging==21.0
# via tox
pluggy==0.13.1
# via tox
Expand All @@ -38,13 +38,13 @@ six==1.16.0
# virtualenv
toml==0.10.2
# via tox
tox-battery==0.6.1
# via -r requirements/ci.in
tox==3.23.1
# via
# -r requirements/ci.in
# tox-battery
urllib3==1.26.5
tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==1.26.6
# via requests
virtualenv==20.4.7
# via tox
3 changes: 3 additions & 0 deletions requirements/constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ jsonfield2==3.0.3
celery==5.0.4
# celery latest version requires click<8.0.0
click<8.0.0

# pinning because to match pin in edx-platform: https://github.com/edx/edx-platform/blob/e25f00f35cb2ed70502bb0b28909535d55e5525e/requirements/constraints.txt#L83
django-webpack-loader<1.0.0
60 changes: 31 additions & 29 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
appdirs==1.4.4
# via virtualenv
astroid==2.5.6
astroid==2.6.2
# via
# pylint
# pylint-celery
Expand All @@ -18,20 +18,20 @@ chardet==4.0.0
# via
# diff-cover
# requests
click-log==0.3.2
# via edx-lint
click==7.1.2
# via
# -c requirements/constraints.txt
# click-log
# code-annotations
# edx-lint
# pip-tools
click-log==0.3.2
# via edx-lint
code-annotations==1.1.2
# via edx-lint
colorama==0.4.4
# via twine
diff-cover==5.1.2
diff-cover==6.0.0
# via -r requirements/dev.in
distlib==0.3.2
# via virtualenv
Expand All @@ -42,9 +42,8 @@ django==2.2.24
# -r requirements/quality.in
# edx-i18n-tools
# edx-lint
docutils==0.16
docutils==0.17.1
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# readme-renderer
# rstcheck
edx-i18n-tools==0.5.3
Expand All @@ -59,23 +58,23 @@ filelock==3.0.12
# virtualenv
idna==2.10
# via requests
importlib-metadata==4.5.0
importlib-metadata==4.6.1
# via
# keyring
# twine
inflect==5.3.0
# via jinja2-pluralize
isort==5.8.0
isort==5.9.2
# via
# -r requirements/quality.in
# pylint
jinja2-pluralize==0.3.0
# via diff-cover
jinja2==3.0.1
# via
# code-annotations
# diff-cover
# jinja2-pluralize
jinja2-pluralize==0.3.0
# via diff-cover
keyring==23.0.1
# via twine
lazy-object-proxy==1.6.0
Expand All @@ -84,21 +83,21 @@ markupsafe==2.0.1
# via jinja2
mccabe==0.6.1
# via pylint
packaging==20.9
packaging==21.0
# via
# bleach
# tox
path==16.0.0
# via path.py
path.py==12.5.0
# via
# -r requirements/dev.in
# edx-i18n-tools
path==15.1.2
# via path.py
pbr==5.6.0
# via stevedore
pep517==0.10.0
# via pip-tools
pip-tools==6.1.0
pip-tools==6.2.0
# via -r requirements/dev.in
pkginfo==1.7.0
# via twine
Expand All @@ -118,6 +117,12 @@ pygments==2.9.0
# via
# diff-cover
# readme-renderer
pylint==2.9.3
# via
# edx-lint
# pylint-celery
# pylint-django
# pylint-plugin-utils
pylint-celery==0.3
# via edx-lint
pylint-django==2.4.4
Expand All @@ -126,12 +131,6 @@ pylint-plugin-utils==0.6
# via
# pylint-celery
# pylint-django
pylint==2.8.3
# via
# edx-lint
# pylint-celery
# pylint-django
# pylint-plugin-utils
pyparsing==2.4.7
# via packaging
python-slugify==5.0.2
Expand All @@ -144,12 +143,12 @@ pyyaml==5.4.1
# edx-i18n-tools
readme-renderer==29.0
# via twine
requests-toolbelt==0.9.1
# via twine
requests==2.25.1
# via
# requests-toolbelt
# twine
requests-toolbelt==0.9.1
# via twine
rfc3986==1.5.0
# via twine
rstcheck==3.3.1
Expand All @@ -175,30 +174,33 @@ toml==0.10.2
# pep517
# pylint
# tox
tox-battery==0.6.1
# via -r requirements/dev.in
tox==3.23.1
# via
# -r requirements/dev.in
# tox-battery
tqdm==4.61.0
tox-battery==0.6.1
# via -r requirements/dev.in
tqdm==4.61.2
# via twine
twine==3.4.1
# via
# -r requirements/dev.in
# -r requirements/quality.in
urllib3==1.26.5
urllib3==1.26.6
# via requests
virtualenv==20.4.7
# via tox
webencodings==0.5.1
# via bleach
wheel==0.36.2
# via -r requirements/dev.in
# via
# -r requirements/dev.in
# pip-tools
wrapt==1.12.1
# via astroid
zipp==3.4.1
zipp==3.5.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
Loading

0 comments on commit 9c25a04

Please sign in to comment.