From 55473d12d45e61bec0c62615e72fa7fd72b1154d Mon Sep 17 00:00:00 2001 From: edX requirements bot <49161187+edx-requirements-bot@users.noreply.github.com> Date: Tue, 30 Apr 2024 02:45:57 -0400 Subject: [PATCH] chore: Updating Python Requirements (#746) * chore: Updating Python Requirements * build: Update codecov to use the repository upload token. --------- Co-authored-by: Irtaza Akram Update request.py --- .github/workflows/ci.yml | 3 ++- requirements/base.txt | 6 ++++-- requirements/ci.txt | 8 ++++---- requirements/dev.txt | 24 ++++++++++++++---------- requirements/django.txt | 12 ++++++++---- requirements/doc.txt | 12 ++++++++---- requirements/test.txt | 24 ++++++++++++++---------- xblock/django/request.py | 2 +- 8 files changed, 55 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b069265e..833b7fea7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,8 @@ jobs: - name: Run Coverage if: matrix.python-version == '3.8' && matrix.toxenv == 'django42' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: flags: unittests fail_ci_if_error: true + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/requirements/base.txt b/requirements/base.txt index 05b305ef8..4624577e5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,9 @@ # appdirs==1.4.4 # via fs -edx-opaque-keys==2.5.1 +dnspython==2.6.1 + # via pymongo +edx-opaque-keys==2.9.0 # via -r requirements/base.in fs==2.4.16 # via -r requirements/base.in @@ -20,7 +22,7 @@ markupsafe==2.1.5 # mako pbr==6.0.0 # via stevedore -pymongo==3.13.0 +pymongo==4.4.0 # via edx-opaque-keys python-dateutil==2.9.0.post0 # via -r requirements/base.in diff --git a/requirements/ci.txt b/requirements/ci.txt index ce98b2013..4530829f4 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -10,7 +10,7 @@ chardet==5.2.0 # via tox colorama==0.4.6 # via tox -coverage==7.4.4 +coverage==7.5.0 # via -r requirements/ci.in distlib==0.3.8 # via virtualenv @@ -22,7 +22,7 @@ packaging==24.0 # via # pyproject-api # tox -platformdirs==4.2.0 +platformdirs==4.2.1 # via # tox # virtualenv @@ -34,7 +34,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.14.2 +tox==4.15.0 # via -r requirements/ci.in -virtualenv==20.25.3 +virtualenv==20.26.0 # via tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 2150294b1..685c4e5da 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -25,11 +25,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/test.txt # django -boto3==1.34.88 +boto3==1.34.93 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.88 +botocore==1.34.93 # via # -r requirements/test.txt # boto3 @@ -69,7 +69,7 @@ colorama==0.4.6 # -r requirements/ci.txt # -r requirements/test.txt # tox -coverage[toml]==7.4.4 +coverage[toml]==7.5.0 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -94,9 +94,13 @@ django==4.2.11 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt # openedx-django-pyfs +dnspython==2.6.1 + # via + # -r requirements/test.txt + # pymongo edx-lint==5.3.6 # via -r requirements/test.txt -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.9.0 # via -r requirements/test.txt exceptiongroup==1.2.1 # via @@ -127,7 +131,7 @@ importlib-metadata==6.11.0 # -r requirements/test.txt # build # typeguard -inflect==7.2.0 +inflect==7.2.1 # via # -r requirements/test.txt # jinja2-pluralize @@ -194,7 +198,7 @@ pbr==6.0.0 # stevedore pip-tools==7.4.1 # via -r requirements/pip-tools.txt -platformdirs==4.2.0 +platformdirs==4.2.1 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -234,7 +238,7 @@ pylint-plugin-utils==0.8.2 # -r requirements/test.txt # pylint-celery # pylint-django -pymongo==3.13.0 +pymongo==4.4.0 # via # -r requirements/test.txt # edx-opaque-keys @@ -248,7 +252,7 @@ pyproject-hooks==1.0.0 # -r requirements/pip-tools.txt # build # pip-tools -pytest==8.1.1 +pytest==8.2.0 # via # -r requirements/test.txt # pytest-cov @@ -318,7 +322,7 @@ tomlkit==0.12.4 # via # -r requirements/test.txt # pylint -tox==4.14.2 +tox==4.15.0 # via # -r requirements/ci.txt # -r requirements/test.txt @@ -339,7 +343,7 @@ urllib3==1.26.18 # via # -r requirements/test.txt # botocore -virtualenv==20.25.3 +virtualenv==20.26.0 # via # -r requirements/ci.txt # -r requirements/test.txt diff --git a/requirements/django.txt b/requirements/django.txt index b7e2f55c1..2109ccc92 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -14,9 +14,9 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.in # django -boto3==1.34.88 +boto3==1.34.93 # via fs-s3fs -botocore==1.34.88 +botocore==1.34.93 # via # boto3 # s3transfer @@ -25,7 +25,11 @@ django==4.2.11 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.in # openedx-django-pyfs -edx-opaque-keys==2.5.1 +dnspython==2.6.1 + # via + # -r requirements/base.txt + # pymongo +edx-opaque-keys==2.9.0 # via -r requirements/base.txt fs==2.4.16 # via @@ -54,7 +58,7 @@ pbr==6.0.0 # via # -r requirements/base.txt # stevedore -pymongo==3.13.0 +pymongo==4.4.0 # via # -r requirements/base.txt # edx-opaque-keys diff --git a/requirements/doc.txt b/requirements/doc.txt index 4bcca580d..6c13476a7 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -26,11 +26,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # django beautifulsoup4==4.12.3 # via pydata-sphinx-theme -boto3==1.34.88 +boto3==1.34.93 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.88 +botocore==1.34.93 # via # -r requirements/django.txt # boto3 @@ -44,11 +44,15 @@ django==4.2.11 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.txt # openedx-django-pyfs +dnspython==2.6.1 + # via + # -r requirements/django.txt + # pymongo docutils==0.19 # via # pydata-sphinx-theme # sphinx -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.9.0 # via -r requirements/django.txt fs==2.4.16 # via @@ -104,7 +108,7 @@ pygments==2.17.2 # accessible-pygments # pydata-sphinx-theme # sphinx -pymongo==3.13.0 +pymongo==4.4.0 # via # -r requirements/django.txt # edx-opaque-keys diff --git a/requirements/test.txt b/requirements/test.txt index b3b53c635..4ba5c291a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -23,11 +23,11 @@ backports-zoneinfo==0.2.1 ; python_version < "3.9" # via # -r requirements/django.txt # django -boto3==1.34.88 +boto3==1.34.93 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.88 +botocore==1.34.93 # via # -r requirements/django.txt # boto3 @@ -47,7 +47,7 @@ code-annotations==1.8.0 # via edx-lint colorama==0.4.6 # via tox -coverage[toml]==7.4.4 +coverage[toml]==7.5.0 # via # -r requirements/test.in # pytest-cov @@ -65,9 +65,13 @@ distlib==0.3.8 # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.txt # openedx-django-pyfs +dnspython==2.6.1 + # via + # -r requirements/django.txt + # pymongo edx-lint==5.3.6 # via -r requirements/test.in -edx-opaque-keys==2.5.1 +edx-opaque-keys==2.9.0 # via -r requirements/django.txt exceptiongroup==1.2.1 # via @@ -92,7 +96,7 @@ importlib-metadata==6.11.0 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # typeguard -inflect==7.2.0 +inflect==7.2.1 # via jinja2-pluralize iniconfig==2.0.0 # via pytest @@ -140,7 +144,7 @@ pbr==6.0.0 # via # -r requirements/django.txt # stevedore -platformdirs==4.2.0 +platformdirs==4.2.1 # via # pylint # tox @@ -169,13 +173,13 @@ pylint-plugin-utils==0.8.2 # via # pylint-celery # pylint-django -pymongo==3.13.0 +pymongo==4.4.0 # via # -r requirements/django.txt # edx-opaque-keys pyproject-api==1.6.1 # via tox -pytest==8.1.1 +pytest==8.2.0 # via # -r requirements/test.in # pytest-cov @@ -231,7 +235,7 @@ tomli==2.0.1 # tox tomlkit==0.12.4 # via pylint -tox==4.14.2 +tox==4.15.0 # via -r requirements/test.in typeguard==4.2.1 # via inflect @@ -248,7 +252,7 @@ urllib3==1.26.18 # via # -r requirements/django.txt # botocore -virtualenv==20.25.3 +virtualenv==20.26.0 # via tox web-fragments==2.2.0 # via -r requirements/django.txt diff --git a/xblock/django/request.py b/xblock/django/request.py index 5b49bf9b4..067bdb80c 100644 --- a/xblock/django/request.py +++ b/xblock/django/request.py @@ -9,7 +9,7 @@ def webob_to_django_response(webob_response, streaming=False): """Returns a django response to the `webob_response`""" - if streaming : + if streaming: django_response = StreamingHttpResponse( webob_response.app_iter, content_type=webob_response.content_type,