Skip to content

Commit

Permalink
Merge pull request #489 from openedx/jenkins/upgrade-python-requireme…
Browse files Browse the repository at this point in the history
…nts-047dfc2

Python Requirements Update
  • Loading branch information
DawoudSheraz authored Mar 11, 2024
2 parents 047dfc2 + 42fbbb2 commit 9b7f944
Show file tree
Hide file tree
Showing 9 changed files with 93 additions and 73 deletions.
3 changes: 1 addition & 2 deletions edxval/pacts/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ class AuthenticationMiddleware(MiddlewareMixin):
"""

def __init__(self, get_response):
super().__init__()
super().__init__(get_response)
self.auth_user = User.objects.get_or_create(username='edx', is_staff=True)[0]
self.auth_user.user_permissions.set(Permission.objects.filter(content_type__app_label='edxval'))
self.get_response = get_response

def process_view(self, request, view_func, view_args, view_kwargs): # pylint: disable=unused-argument
"""
Expand Down
2 changes: 1 addition & 1 deletion edxval/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def post(self, request):

try:
validate_generated_images(generated_images, LIST_MAX_ITEMS)
except Exception as e: # pylint: disable=broad-except
except Exception as e:
return Response(
status=status.HTTP_400_BAD_REQUEST,
data={'message': str(e)}
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
certifi==2024.2.2
# via requests
Expand Down Expand Up @@ -46,7 +46,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.13.0
tox==4.14.1
# via -r requirements/ci.in
urllib3==2.2.1
# via requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


# using LTS django version
Django<4.0
Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
Expand Down
57 changes: 32 additions & 25 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,20 @@ appdirs==1.4.4
# via fs
asgiref==3.7.2
# via django
astroid==3.0.3
astroid==3.1.0
# via
# pylint
# pylint-celery
cachetools==5.3.2
backports-zoneinfo==0.2.1
# via django
cachetools==5.3.3
# via tox
certifi==2024.2.2
# via requests
cffi==1.16.0
# via
# cryptography
# pact-python
# pynacl
chardet==5.2.0
# via
Expand Down Expand Up @@ -54,19 +57,19 @@ coverage[toml]==6.5.0
# pytest-cov
coveralls==3.3.1
# via -r requirements/ci.in
cryptography==42.0.4
cryptography==42.0.5
# via
# pyjwt
# secretstorage
ddt==1.7.1
ddt==1.7.2
# via -r requirements/test.in
diff-cover==8.0.3
# via -r requirements/dev.in
dill==0.3.8
# via pylint
distlib==0.3.8
# via virtualenv
django==3.2.24
django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -105,7 +108,7 @@ drf-jwt==1.19.2
# via edx-drf-extensions
edx-django-release-util==1.3.0
# via -r requirements/base.in
edx-django-utils==5.10.1
edx-django-utils==5.11.0
# via
# edx-drf-extensions
# edx-toggles
Expand All @@ -121,7 +124,7 @@ exceptiongroup==1.2.0
# via
# anyio
# pytest
fastapi==0.109.2
fastapi==0.110.0
# via pact-python
filelock==3.13.1
# via
Expand All @@ -135,11 +138,12 @@ idna==3.6
# via
# anyio
# requests
importlib-metadata==7.0.1
# yarl
importlib-metadata==7.0.2
# via
# keyring
# twine
importlib-resources==6.1.1
importlib-resources==6.1.3
# via keyring
iniconfig==2.0.0
# via pytest
Expand All @@ -157,7 +161,7 @@ jinja2==3.1.3
# via
# code-annotations
# diff-cover
keyring==24.3.0
keyring==24.3.1
# via twine
lxml==5.1.0
# via -r requirements/base.in
Expand All @@ -173,6 +177,8 @@ mock==5.1.0
# via -r requirements/test.in
more-itertools==10.2.0
# via jaraco-classes
multidict==6.0.5
# via yarl
newrelic==9.7.0
# via edx-django-utils
nh3==0.2.15
Expand All @@ -182,13 +188,13 @@ packaging==23.2
# pyproject-api
# pytest
# tox
pact-python==2.1.1
pact-python==2.1.3
# via -r requirements/test.in
pbr==6.0.0
# via stevedore
pillow==10.2.0
# via -r requirements/base.in
pkginfo==1.9.6
pkginfo==1.10.0
# via twine
platformdirs==4.2.0
# via
Expand All @@ -208,9 +214,9 @@ pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
# via cffi
pydantic==2.6.1
pydantic==2.6.3
# via fastapi
pydantic-core==2.16.2
pydantic-core==2.16.3
# via pydantic
pydocstyle==6.3.0
# via -r requirements/quality.in
Expand All @@ -223,7 +229,7 @@ pyjwt[crypto]==2.8.0
# via
# drf-jwt
# edx-drf-extensions
pylint==3.0.3
pylint==3.1.0
# via
# edx-lint
# pylint-celery
Expand All @@ -245,7 +251,7 @@ pyproject-api==1.6.1
# via tox
pysrt==1.1.2
# via -r requirements/base.in
pytest==8.0.1
pytest==8.0.2
# via
# pytest-cov
# pytest-django
Expand All @@ -256,15 +262,13 @@ pytest-django==4.8.0
python-slugify==8.0.4
# via code-annotations
pytz==2024.1
# via
# django
# djangorestframework
# via djangorestframework
pyyaml==6.0.1
# via
# code-annotations
# edx-django-release-util
# responses
readme-renderer==42.0
readme-renderer==43.0
# via twine
requests==2.31.0
# via
Expand All @@ -280,7 +284,7 @@ responses==0.25.0
# via -r requirements/test.in
rfc3986==2.0.0
# via twine
rich==13.7.0
rich==13.7.1
# via twine
secretstorage==3.3.3
# via keyring
Expand All @@ -292,7 +296,7 @@ six==1.16.0
# edx-lint
# fs
# pact-python
sniffio==1.3.0
sniffio==1.3.1
# via anyio
snowballstemmer==2.2.0
# via pydocstyle
Expand All @@ -314,20 +318,21 @@ tomli==2.0.1
# pyproject-api
# pytest
# tox
tomlkit==0.12.3
tomlkit==0.12.4
# via pylint
tox==4.13.0
tox==4.14.1
# via -r requirements/ci.in
twine==5.0.0
# via -r requirements/quality.in
typing-extensions==4.9.0
typing-extensions==4.10.0
# via
# annotated-types
# anyio
# asgiref
# astroid
# edx-opaque-keys
# fastapi
# pact-python
# pydantic
# pydantic-core
# pylint
Expand All @@ -343,6 +348,8 @@ uvicorn==0.27.1
# via pact-python
virtualenv==20.25.1
# via tox
yarl==1.9.4
# via pact-python
zipp==3.17.0
# via
# importlib-metadata
Expand Down
6 changes: 3 additions & 3 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#
# make upgrade
#
build==1.0.3
build==1.1.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.1
importlib-metadata==7.0.2
# via build
packaging==23.2
# via build
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.42.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.1.0
setuptools==69.1.1
# via -r requirements/pip.in
Loading

0 comments on commit 9b7f944

Please sign in to comment.