From cfd97bf56d3ea5491056f5e8e751aeaa39a96216 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 14 Mar 2024 15:01:35 -0400 Subject: [PATCH 1/4] chore: Run `make upgrade` --- requirements/ci.txt | 2 +- requirements/dev.txt | 19 ++++++++++--------- requirements/django.txt | 4 ++-- requirements/doc.txt | 14 ++++++++------ requirements/pip-tools.txt | 12 +++++++----- requirements/pip.txt | 4 ++-- requirements/test.txt | 12 ++++++------ 7 files changed, 36 insertions(+), 31 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index 80c15ab4e..db3980cce 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -18,7 +18,7 @@ filelock==3.13.1 # via # tox # virtualenv -packaging==23.2 +packaging==24.0 # via # pyproject-api # tox diff --git a/requirements/dev.txt b/requirements/dev.txt index 8f7caa1ab..1eb74e980 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -21,11 +21,11 @@ attrs==23.2.0 # via # -r requirements/test.txt # hypothesis -boto3==1.34.59 +boto3==1.34.62 # via # -r requirements/test.txt # fs-s3fs -botocore==1.34.59 +botocore==1.34.62 # via # -r requirements/test.txt # boto3 @@ -56,7 +56,7 @@ click-log==0.4.0 # via # -r requirements/test.txt # edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via # -r requirements/test.txt # edx-lint @@ -114,10 +114,11 @@ fs-s3fs==1.1.1 # via # -r requirements/test.txt # openedx-django-pyfs -hypothesis==6.99.0 +hypothesis==6.99.6 # via -r requirements/test.txt -importlib-metadata==7.0.2 +importlib-metadata==6.11.0 # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/pip-tools.txt # build inflect==7.0.0 @@ -168,7 +169,7 @@ mock==5.1.0 # via -r requirements/test.txt openedx-django-pyfs==3.5.0 # via -r requirements/test.txt -packaging==23.2 +packaging==24.0 # via # -r requirements/ci.txt # -r requirements/pip-tools.txt @@ -201,7 +202,7 @@ pluggy==1.4.0 # tox pycodestyle==2.11.1 # via -r requirements/test.txt -pydantic==2.6.3 +pydantic==2.6.4 # via # -r requirements/test.txt # inflect @@ -346,11 +347,11 @@ web-fragments==2.1.0 # via -r requirements/test.txt webob==1.8.7 # via -r requirements/test.txt -wheel==0.42.0 +wheel==0.43.0 # via # -r requirements/pip-tools.txt # pip-tools -zipp==3.17.0 +zipp==3.18.0 # via # -r requirements/pip-tools.txt # importlib-metadata diff --git a/requirements/django.txt b/requirements/django.txt index 267f7d682..ed66606fa 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -8,9 +8,9 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs -boto3==1.34.59 +boto3==1.34.62 # via fs-s3fs -botocore==1.34.59 +botocore==1.34.62 # via # boto3 # s3transfer diff --git a/requirements/doc.txt b/requirements/doc.txt index 253435920..8e2fc4117 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -18,11 +18,11 @@ babel==2.14.0 # sphinx beautifulsoup4==4.12.3 # via pydata-sphinx-theme -boto3==1.34.59 +boto3==1.34.62 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.59 +botocore==1.34.62 # via # -r requirements/django.txt # boto3 @@ -55,8 +55,10 @@ idna==3.6 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.0.2 - # via sphinx +importlib-metadata==6.11.0 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # sphinx jinja2==3.1.3 # via sphinx jmespath==1.0.1 @@ -81,7 +83,7 @@ mock==5.1.0 # via -r requirements/doc.in openedx-django-pyfs==3.5.0 # via -r requirements/django.txt -packaging==23.2 +packaging==24.0 # via # pydata-sphinx-theme # sphinx @@ -170,7 +172,7 @@ web-fragments==2.1.0 # via -r requirements/django.txt webob==1.8.7 # via -r requirements/django.txt -zipp==3.17.0 +zipp==3.18.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 01d695ace..8c586a236 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -8,9 +8,11 @@ build==1.1.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==7.0.2 - # via build -packaging==23.2 +importlib-metadata==6.11.0 + # via + # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt + # build +packaging==24.0 # via build pip-tools==7.4.1 # via -r requirements/pip-tools.in @@ -23,9 +25,9 @@ tomli==2.0.1 # build # pip-tools # pyproject-hooks -wheel==0.42.0 +wheel==0.43.0 # via pip-tools -zipp==3.17.0 +zipp==3.18.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 66656035b..cf449024a 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.42.0 +wheel==0.43.0 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.1 +setuptools==69.2.0 # via -r requirements/pip.in diff --git a/requirements/test.txt b/requirements/test.txt index 146523d53..8edff7941 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -17,11 +17,11 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via hypothesis -boto3==1.34.59 +boto3==1.34.62 # via # -r requirements/django.txt # fs-s3fs -botocore==1.34.59 +botocore==1.34.62 # via # -r requirements/django.txt # boto3 @@ -37,7 +37,7 @@ click==8.1.7 # edx-lint click-log==0.4.0 # via edx-lint -code-annotations==1.6.0 +code-annotations==1.7.0 # via edx-lint colorama==0.4.6 # via tox @@ -80,7 +80,7 @@ fs-s3fs==1.1.1 # via # -r requirements/django.txt # openedx-django-pyfs -hypothesis==6.99.0 +hypothesis==6.99.6 # via -r requirements/test.in inflect==7.0.0 # via jinja2-pluralize @@ -119,7 +119,7 @@ mock==5.1.0 # via -r requirements/test.in openedx-django-pyfs==3.5.0 # via -r requirements/django.txt -packaging==23.2 +packaging==24.0 # via # pyproject-api # pytest @@ -142,7 +142,7 @@ pluggy==1.4.0 # tox pycodestyle==2.11.1 # via -r requirements/test.in -pydantic==2.6.3 +pydantic==2.6.4 # via inflect pydantic-core==2.16.3 # via pydantic From 646e8ea03f2530ac9e3c38a53ca1102be090829c Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 14 Mar 2024 15:01:55 -0400 Subject: [PATCH 2/4] build: Don't explicityl pin the django version here. It gets pinned in the common constraints file that gets pulled in and we shouldn't pin it any further here. This isn't used for unit testing but is used for things like the docs builds so it should stay up-to-date but is not critical to the functionality of the repo. --- requirements/django.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/django.in b/requirements/django.in index 0bc5d9d74..064856e67 100644 --- a/requirements/django.in +++ b/requirements/django.in @@ -5,6 +5,6 @@ -r base.txt # Core XBlock dependencies -Django>=2.2,<3.0 +Django openedx-django-pyfs>=1.0.5 lazy From 08110afce2081d06e9dc28296d6bb55c31836726 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 14 Mar 2024 15:07:59 -0400 Subject: [PATCH 3/4] build: Explicitly restrict backports.zoneinfo to python<3.9 For somereason whene pip-compile is compiling requiremnets it's not pulling this environment marker from the upstream dependency so we need to add this depedency of django explicitly for now so that we can restrict it to python<3.9 and have that show up in our requirements files. --- requirements/django.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/requirements/django.in b/requirements/django.in index 064856e67..c15b7a5ea 100644 --- a/requirements/django.in +++ b/requirements/django.in @@ -8,3 +8,7 @@ Django openedx-django-pyfs>=1.0.5 lazy + +# Needed until we drop testing on Python 3.8 so that +# we don't try to install this on newer versions of python. +backports.zoneinfo;python_version<"3.9" From e3e059f1d5217cce9edc6e195a04e8739a2ec51b Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 14 Mar 2024 15:09:32 -0400 Subject: [PATCH 4/4] chore: Run `make upgrade` --- requirements/dev.txt | 15 +++++++++++---- requirements/django.txt | 13 +++++++++---- requirements/doc.txt | 12 ++++++++++-- requirements/test.txt | 13 ++++++++++--- 4 files changed, 40 insertions(+), 13 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 1eb74e980..72d634f81 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -12,6 +12,10 @@ appdirs==1.4.4 # via # -r requirements/test.txt # fs +asgiref==3.7.2 + # via + # -r requirements/test.txt + # django astroid==3.1.0 # via # -r requirements/test.txt @@ -21,6 +25,10 @@ attrs==23.2.0 # via # -r requirements/test.txt # hypothesis +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/test.txt + # django boto3==1.34.62 # via # -r requirements/test.txt @@ -85,7 +93,7 @@ distlib==0.3.8 # -r requirements/ci.txt # -r requirements/test.txt # virtualenv -django==2.2.28 +django==4.2.11 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/test.txt @@ -266,9 +274,7 @@ python-slugify==8.0.4 # -r requirements/test.txt # code-annotations pytz==2024.1 - # via - # -r requirements/test.txt - # django + # via -r requirements/test.txt pyyaml==6.0.1 # via # -r requirements/test.txt @@ -328,6 +334,7 @@ typing-extensions==4.10.0 # via # -r requirements/test.txt # annotated-types + # asgiref # astroid # edx-opaque-keys # inflect diff --git a/requirements/django.txt b/requirements/django.txt index ed66606fa..9453018c2 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -8,13 +8,19 @@ appdirs==1.4.4 # via # -r requirements/base.txt # fs +asgiref==3.7.2 + # via django +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/django.in + # django boto3==1.34.62 # via fs-s3fs botocore==1.34.62 # via # boto3 # s3transfer -django==2.2.28 +django==4.2.11 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.in @@ -59,9 +65,7 @@ python-dateutil==2.9.0.post0 # -r requirements/base.txt # botocore pytz==2024.1 - # via - # -r requirements/base.txt - # django + # via -r requirements/base.txt pyyaml==6.0.1 # via -r requirements/base.txt s3transfer==0.10.0 @@ -83,6 +87,7 @@ stevedore==5.2.0 typing-extensions==4.10.0 # via # -r requirements/base.txt + # asgiref # edx-opaque-keys urllib3==1.26.18 # via botocore diff --git a/requirements/doc.txt b/requirements/doc.txt index 8e2fc4117..1b8a48dbf 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -12,10 +12,18 @@ appdirs==1.4.4 # via # -r requirements/django.txt # fs +asgiref==3.7.2 + # via + # -r requirements/django.txt + # django babel==2.14.0 # via # pydata-sphinx-theme # sphinx +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/django.txt + # django beautifulsoup4==4.12.3 # via pydata-sphinx-theme boto3==1.34.62 @@ -31,7 +39,7 @@ certifi==2024.2.2 # via requests charset-normalizer==3.3.2 # via requests -django==2.2.28 +django==4.2.11 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # -r requirements/django.txt @@ -110,7 +118,6 @@ pytz==2024.1 # via # -r requirements/django.txt # babel - # django pyyaml==6.0.1 # via -r requirements/django.txt requests==2.31.0 @@ -161,6 +168,7 @@ stevedore==5.2.0 typing-extensions==4.10.0 # via # -r requirements/django.txt + # asgiref # edx-opaque-keys # pydata-sphinx-theme urllib3==1.26.18 diff --git a/requirements/test.txt b/requirements/test.txt index 8edff7941..3ee2d2450 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -10,6 +10,10 @@ appdirs==1.4.4 # via # -r requirements/django.txt # fs +asgiref==3.7.2 + # via + # -r requirements/django.txt + # django astroid==3.1.0 # via # -r requirements/test.in @@ -17,6 +21,10 @@ astroid==3.1.0 # pylint-celery attrs==23.2.0 # via hypothesis +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # -r requirements/django.txt + # django boto3==1.34.62 # via # -r requirements/django.txt @@ -185,9 +193,7 @@ python-dateutil==2.9.0.post0 python-slugify==8.0.4 # via code-annotations pytz==2024.1 - # via - # -r requirements/django.txt - # django + # via -r requirements/django.txt pyyaml==6.0.1 # via # -r requirements/django.txt @@ -233,6 +239,7 @@ typing-extensions==4.10.0 # via # -r requirements/django.txt # annotated-types + # asgiref # astroid # edx-opaque-keys # inflect