From 7b0ac039f4721959dfb0bb323fc8fa5c6caaff2c Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Wed, 20 Sep 2023 13:34:26 +0500 Subject: [PATCH 1/7] feat!: Upgrade to Django 4.2 --- .github/workflows/ci.yml | 2 +- Makefile | 12 +----------- requirements/base.txt | 20 ++++++++++---------- requirements/common_constraints.txt | 2 +- requirements/constraints.txt | 5 +++++ requirements/dev.txt | 22 +++++++++++----------- requirements/doc.txt | 24 ++++++++++++------------ requirements/pip-tools.txt | 2 +- requirements/production.txt | 20 ++++++++++---------- requirements/quality.txt | 20 ++++++++++---------- requirements/test.txt | 22 +++++++++++----------- requirements/validation.txt | 22 +++++++++++----------- 12 files changed, 84 insertions(+), 89 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49e906d5..b2578f84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: python-version: ["3.8"] - django-version: ["pinned", "4.2"] + django-version: ["pinned"] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 diff --git a/Makefile b/Makefile index 3d01e4c0..c2c89998 100644 --- a/Makefile +++ b/Makefile @@ -111,20 +111,10 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in - sed 's/Django<2.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt # This is a temporary solution to override the real common_constraints.txt # In edx-lint, until the pyjwt constraint in edx-lint has been removed. # See BOM-271 for more details. - sed 's/pyjwt\[crypto\]<2.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/social-auth-core<4.0.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/edx-auth-backends<4.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/edx-drf-extensions<7.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/drf-jwt<1.19.1//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp requirements/common_constraints.txt # Make sure to compile files after any other files they include! pip-compile --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in diff --git a/requirements/base.txt b/requirements/base.txt index c5e4dc3b..5e2dfba0 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -19,12 +19,13 @@ backoff==1.10.0 backports-zoneinfo[tzdata]==0.2.1 # via # celery + # django # kombu billiard==4.1.0 # via celery -boto3==1.28.48 +boto3==1.28.51 # via django-ses -botocore==1.31.48 +botocore==1.31.51 # via # boto3 # s3transfer @@ -57,7 +58,7 @@ click-repl==0.3.0 # via celery code-annotations==1.5.0 # via edx-toggles -cryptography==41.0.3 +cryptography==41.0.4 # via # pyjwt # social-auth-core @@ -65,9 +66,9 @@ defusedxml==0.7.1 # via # python3-openid # social-auth-core -django==3.2.21 +django==4.2.5 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.in # django-celery-results # django-cors-headers @@ -105,7 +106,7 @@ django-durationwidget==1.0.5 # via -r requirements/base.in django-extensions==3.2.3 # via -r requirements/base.in -django-filter==23.2 +django-filter==23.3 # via -r requirements/base.in django-log-request-id==2.1.0 # via -r requirements/base.in @@ -159,7 +160,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.9.3 +edx-drf-extensions==8.10.0 # via # -r requirements/base.in # edx-rbac @@ -232,7 +233,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.in - # django # django-ses # djangorestframework # drf-yasg @@ -284,7 +284,7 @@ stevedore==5.1.0 # edx-opaque-keys text-unidecode==1.3 # via python-slugify -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # asgiref # edx-opaque-keys @@ -308,5 +308,5 @@ vine==5.0.0 # kombu wcwidth==0.2.6 # via prompt-toolkit -zipp==3.16.2 +zipp==3.17.0 # via -r requirements/base.in diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index d34ab34d..0091b9ec 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -18,7 +18,7 @@ # using LTS django version -Django<4.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 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 48753f51..a1a6a6a0 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -23,3 +23,8 @@ wrapt==1.11.* edx-lint<5.3 pylint<2.15 astroid<2.12 + +# Stay on LTS release +# This can be removed once all IDAs have been upgraded to Django 4.2 +# and the global constraint has been updated from Django<4.0 to Django<4.3 +Django<4.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index d350a897..8e0154b5 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -34,16 +34,17 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/validation.txt # celery + # django # kombu billiard==4.1.0 # via # -r requirements/validation.txt # celery -boto3==1.28.48 +boto3==1.28.51 # via # -r requirements/validation.txt # django-ses -botocore==1.31.48 +botocore==1.31.51 # via # -r requirements/validation.txt # boto3 @@ -108,7 +109,7 @@ coverage[toml]==7.3.1 # via # -r requirements/validation.txt # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/validation.txt # pyjwt @@ -130,9 +131,9 @@ dill==0.3.7 # via # -r requirements/validation.txt # pylint -django==3.2.21 +django==4.2.5 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/validation.txt # django-celery-results # django-cors-headers @@ -173,13 +174,13 @@ django-debug-toolbar==4.2.0 # via -r requirements/dev.in django-durationwidget==1.0.5 # via -r requirements/validation.txt -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via -r requirements/validation.txt django-extensions==3.2.3 # via # -r requirements/dev.in # -r requirements/validation.txt -django-filter==23.2 +django-filter==23.3 # via -r requirements/validation.txt django-log-request-id==2.1.0 # via -r requirements/validation.txt @@ -237,7 +238,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.9.3 +edx-drf-extensions==8.10.0 # via # -r requirements/validation.txt # edx-rbac @@ -471,7 +472,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/validation.txt - # django # django-ses # djangorestframework # drf-yasg @@ -566,7 +566,7 @@ tomlkit==0.12.1 # via # -r requirements/validation.txt # pylint -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/validation.txt # annotated-types @@ -616,7 +616,7 @@ wrapt==1.11.2 # -c requirements/constraints.txt # -r requirements/validation.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via # -r requirements/pip-tools.txt # -r requirements/validation.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 7350a4f2..4cd75e1e 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -40,6 +40,7 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/test.txt # celery + # django # kombu beautifulsoup4==4.12.2 # via pydata-sphinx-theme @@ -47,11 +48,11 @@ billiard==4.1.0 # via # -r requirements/test.txt # celery -boto3==1.28.48 +boto3==1.28.51 # via # -r requirements/test.txt # django-ses -botocore==1.31.48 +botocore==1.31.51 # via # -r requirements/test.txt # boto3 @@ -110,7 +111,7 @@ coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/test.txt # pyjwt @@ -126,9 +127,9 @@ dill==0.3.7 # via # -r requirements/test.txt # pylint -django==3.2.21 +django==4.2.5 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/test.txt # django-celery-results # django-cors-headers @@ -165,11 +166,11 @@ django-crum==0.7.9 # edx-toggles django-durationwidget==1.0.5 # via -r requirements/test.txt -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via -r requirements/test.txt django-extensions==3.2.3 # via -r requirements/test.txt -django-filter==23.2 +django-filter==23.3 # via -r requirements/test.txt django-log-request-id==2.1.0 # via -r requirements/test.txt @@ -236,7 +237,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.9.3 +edx-drf-extensions==8.10.0 # via # -r requirements/test.txt # edx-rbac @@ -368,7 +369,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme==0.14.0 # via sphinx-book-theme pygments==2.16.1 # via @@ -443,7 +444,6 @@ pytz==2023.3.post1 # via # -r requirements/test.txt # babel - # django # django-ses # djangorestframework # drf-yasg @@ -555,7 +555,7 @@ tomlkit==0.12.1 # via # -r requirements/test.txt # pylint -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/test.txt # asgiref @@ -598,7 +598,7 @@ wrapt==1.11.2 # -c requirements/constraints.txt # -r requirements/test.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via # -r requirements/test.txt # importlib-metadata diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index d2e8e4e5..894fa179 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -23,7 +23,7 @@ tomli==2.0.1 # pyproject-hooks wheel==0.41.2 # via pip-tools -zipp==3.16.2 +zipp==3.17.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/production.txt b/requirements/production.txt index f7ce9cdd..8eea5a42 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -26,16 +26,17 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery + # django # kombu billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.48 +boto3==1.28.51 # via # -r requirements/base.txt # django-ses -botocore==1.31.48 +botocore==1.31.51 # via # -r requirements/base.txt # boto3 @@ -83,7 +84,7 @@ code-annotations==1.5.0 # via # -r requirements/base.txt # edx-toggles -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/base.txt # pyjwt @@ -93,9 +94,9 @@ defusedxml==0.7.1 # -r requirements/base.txt # python3-openid # social-auth-core -django==3.2.21 +django==4.2.5 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.txt # django-celery-results # django-cors-headers @@ -134,7 +135,7 @@ django-durationwidget==1.0.5 # via -r requirements/base.txt django-extensions==3.2.3 # via -r requirements/base.txt -django-filter==23.2 +django-filter==23.3 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -192,7 +193,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.9.3 +edx-drf-extensions==8.10.0 # via # -r requirements/base.txt # edx-rbac @@ -318,7 +319,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt - # django # django-ses # djangorestframework # drf-yasg @@ -391,7 +391,7 @@ text-unidecode==1.3 # via # -r requirements/base.txt # python-slugify -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref @@ -425,7 +425,7 @@ wcwidth==0.2.6 # via # -r requirements/base.txt # prompt-toolkit -zipp==3.16.2 +zipp==3.17.0 # via -r requirements/base.txt zope-event==5.0 # via gevent diff --git a/requirements/quality.txt b/requirements/quality.txt index 08154e53..a1e8d51a 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -31,16 +31,17 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery + # django # kombu billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.48 +boto3==1.28.51 # via # -r requirements/base.txt # django-ses -botocore==1.31.48 +botocore==1.31.51 # via # -r requirements/base.txt # boto3 @@ -93,7 +94,7 @@ code-annotations==1.5.0 # -r requirements/base.txt # edx-lint # edx-toggles -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/base.txt # pyjwt @@ -105,9 +106,9 @@ defusedxml==0.7.1 # social-auth-core dill==0.3.7 # via pylint -django==3.2.21 +django==4.2.5 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.txt # django-celery-results # django-cors-headers @@ -146,7 +147,7 @@ django-durationwidget==1.0.5 # via -r requirements/base.txt django-extensions==3.2.3 # via -r requirements/base.txt -django-filter==23.2 +django-filter==23.3 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -204,7 +205,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.9.3 +edx-drf-extensions==8.10.0 # via # -r requirements/base.txt # edx-rbac @@ -352,7 +353,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt - # django # django-ses # djangorestframework # drf-yasg @@ -430,7 +430,7 @@ tomli==2.0.1 # via pylint tomlkit==0.12.1 # via pylint -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref @@ -470,7 +470,7 @@ wrapt==1.11.2 # via # -c requirements/constraints.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.txt b/requirements/test.txt index cca27557..21892abe 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -31,16 +31,17 @@ backports-zoneinfo[tzdata]==0.2.1 # via # -r requirements/base.txt # celery + # django # kombu billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.48 +boto3==1.28.51 # via # -r requirements/base.txt # django-ses -botocore==1.31.48 +botocore==1.31.51 # via # -r requirements/base.txt # boto3 @@ -98,7 +99,7 @@ coverage[toml]==7.3.1 # via # -r requirements/test.in # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/base.txt # pyjwt @@ -112,9 +113,9 @@ defusedxml==0.7.1 # social-auth-core dill==0.3.7 # via pylint -django==3.2.21 +django==4.2.5 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.txt # django-celery-results # django-cors-headers @@ -151,11 +152,11 @@ django-crum==0.7.9 # edx-toggles django-durationwidget==1.0.5 # via -r requirements/base.txt -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via -r requirements/test.in django-extensions==3.2.3 # via -r requirements/base.txt -django-filter==23.2 +django-filter==23.3 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -213,7 +214,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.9.3 +edx-drf-extensions==8.10.0 # via # -r requirements/base.txt # edx-rbac @@ -378,7 +379,6 @@ python3-openid==3.2.0 pytz==2023.3.post1 # via # -r requirements/base.txt - # django # django-ses # djangorestframework # drf-yasg @@ -457,7 +457,7 @@ tomli==2.0.1 # pytest tomlkit==0.12.1 # via pylint -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/base.txt # asgiref @@ -498,7 +498,7 @@ wrapt==1.11.2 # via # -c requirements/constraints.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via -r requirements/base.txt # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/validation.txt b/requirements/validation.txt index ca19868b..574290d3 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -40,18 +40,19 @@ backports-zoneinfo[tzdata]==0.2.1 # -r requirements/quality.txt # -r requirements/test.txt # celery + # django # kombu billiard==4.1.0 # via # -r requirements/quality.txt # -r requirements/test.txt # celery -boto3==1.28.48 +boto3==1.28.51 # via # -r requirements/quality.txt # -r requirements/test.txt # django-ses -botocore==1.31.48 +botocore==1.31.51 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -121,7 +122,7 @@ coverage[toml]==7.3.1 # via # -r requirements/test.txt # pytest-cov -cryptography==41.0.3 +cryptography==41.0.4 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -140,9 +141,9 @@ dill==0.3.7 # -r requirements/quality.txt # -r requirements/test.txt # pylint -django==3.2.21 +django==4.2.5 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt # django-celery-results @@ -188,13 +189,13 @@ django-durationwidget==1.0.5 # via # -r requirements/quality.txt # -r requirements/test.txt -django-dynamic-fixture==4.0.0 +django-dynamic-fixture==4.0.1 # via -r requirements/test.txt django-extensions==3.2.3 # via # -r requirements/quality.txt # -r requirements/test.txt -django-filter==23.2 +django-filter==23.3 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -279,7 +280,7 @@ edx-django-utils==5.7.0 # edx-drf-extensions # edx-rest-api-client # edx-toggles -edx-drf-extensions==8.9.3 +edx-drf-extensions==8.10.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -521,7 +522,6 @@ pytz==2023.3.post1 # via # -r requirements/quality.txt # -r requirements/test.txt - # django # django-ses # djangorestframework # drf-yasg @@ -629,7 +629,7 @@ tomlkit==0.12.1 # -r requirements/quality.txt # -r requirements/test.txt # pylint -typing-extensions==4.7.1 +typing-extensions==4.8.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -679,7 +679,7 @@ wrapt==1.11.2 # -r requirements/quality.txt # -r requirements/test.txt # astroid -zipp==3.16.2 +zipp==3.17.0 # via # -r requirements/quality.txt # -r requirements/test.txt From 062bf77aa73473dbc314257676b2f7371b9a801a Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed Date: Tue, 26 Sep 2023 17:57:59 +0500 Subject: [PATCH 2/7] fix: use USE_DEPRECATED_PYTZ for django 4.2 upgrade --- license_manager/settings/base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/license_manager/settings/base.py b/license_manager/settings/base.py index aa05d2f4..991ab0d1 100644 --- a/license_manager/settings/base.py +++ b/license_manager/settings/base.py @@ -171,6 +171,11 @@ USE_TZ = True +# Django 4.0+ uses zoneinfo if this is not set. We can remove this and +# migrate to zoneinfo after Django 4.2 upgrade. See more on following url +# https://docs.djangoproject.com/en/4.2/releases/4.0/#zoneinfo-default-timezone-implementation +USE_DEPRECATED_PYTZ = True + LOCALE_PATHS = ( root('conf', 'locale'), ) From 677356d3ad00a824723127eeeec94b5b94c0fb30 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Wed, 4 Oct 2023 17:00:04 +0500 Subject: [PATCH 3/7] fix: fix common_constraints override --- Makefile | 1 + requirements/base.txt | 24 ++++++++++++------------ requirements/dev.txt | 34 +++++++++++++++++----------------- requirements/doc.txt | 34 +++++++++++++++++----------------- requirements/pip-tools.txt | 2 +- requirements/production.txt | 26 +++++++++++++------------- requirements/quality.txt | 26 +++++++++++++------------- requirements/test.txt | 30 +++++++++++++++--------------- requirements/validation.txt | 30 +++++++++++++++--------------- 9 files changed, 104 insertions(+), 103 deletions(-) diff --git a/Makefile b/Makefile index 64309ad1..080eff34 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,7 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil # In edx-lint, until the pyjwt constraint in edx-lint has been removed. # See BOM-271 for more details. sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + mv requirements/common_constraints.tmp requirements/common_constraints.txt sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp requirements/common_constraints.txt # Make sure to compile files after any other files they include! diff --git a/requirements/base.txt b/requirements/base.txt index 1b1957c9..88dfb151 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -23,9 +23,9 @@ backports-zoneinfo[tzdata]==0.2.1 # kombu billiard==4.1.0 # via celery -boto3==1.28.51 +boto3==1.28.59 # via django-ses -botocore==1.31.51 +botocore==1.31.59 # via # boto3 # s3transfer @@ -36,11 +36,11 @@ celery==5.3.4 # edx-celeryutils certifi==2023.7.22 # via requests -cffi==1.15.1 +cffi==1.16.0 # via # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via requests click==8.1.7 # via @@ -62,7 +62,7 @@ cryptography==41.0.4 # via # pyjwt # social-auth-core -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core @@ -162,7 +162,7 @@ edx-drf-extensions==8.10.0 # via # -r requirements/base.in # edx-rbac -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via edx-drf-extensions edx-rbac==1.8.0 # via -r requirements/base.in @@ -190,13 +190,13 @@ monotonic==1.6 # via analytics-python mysqlclient==2.2.0 # via -r requirements/base.in -newrelic==9.0.0 +newrelic==9.1.0 # via edx-django-utils oauthlib==3.2.2 # via # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via drf-yasg pbr==5.11.1 # via stevedore @@ -238,7 +238,7 @@ pyyaml==6.0.1 # via # code-annotations # drf-yasg -redis==5.0.0 +redis==5.0.1 # via -r requirements/base.in requests==2.31.0 # via @@ -252,7 +252,7 @@ requests-oauthlib==1.3.1 # via social-auth-core rules==3.3 # via -r requirements/base.in -s3transfer==0.6.2 +s3transfer==0.7.0 # via boto3 semantic-version==2.10.0 # via edx-drf-extensions @@ -295,7 +295,7 @@ unicodecsv==0.14.1 # via djangorestframework-csv uritemplate==4.1.1 # via drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # botocore # requests @@ -304,7 +304,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.8 # via prompt-toolkit zipp==3.17.0 # via -r requirements/base.in diff --git a/requirements/dev.txt b/requirements/dev.txt index 97172e0c..38b461af 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -40,11 +40,11 @@ billiard==4.1.0 # via # -r requirements/validation.txt # celery -boto3==1.28.51 +boto3==1.28.59 # via # -r requirements/validation.txt # django-ses -botocore==1.31.51 +botocore==1.31.59 # via # -r requirements/validation.txt # boto3 @@ -62,12 +62,12 @@ certifi==2023.7.22 # via # -r requirements/validation.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/validation.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/validation.txt # requests @@ -105,7 +105,7 @@ code-annotations==1.5.0 # -r requirements/validation.txt # edx-lint # edx-toggles -coverage[toml]==7.3.1 +coverage[toml]==7.3.2 # via # -r requirements/validation.txt # pytest-cov @@ -118,7 +118,7 @@ ddt==1.6.0 # via # -r requirements/dev.in # -r requirements/validation.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # -r requirements/validation.txt # python3-openid @@ -246,7 +246,7 @@ edx-lint==5.2.5 # via # -c requirements/constraints.txt # -r requirements/validation.txt -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/validation.txt # edx-drf-extensions @@ -262,7 +262,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/validation.txt -faker==19.6.1 +faker==19.6.2 # via # -r requirements/validation.txt # factory-boy @@ -333,7 +333,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/validation.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/validation.txt # edx-django-utils @@ -342,7 +342,7 @@ oauthlib==3.2.2 # -r requirements/validation.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/pip-tools.txt # -r requirements/validation.txt @@ -362,7 +362,7 @@ pbr==5.11.1 # stevedore pip-tools==7.3.0 # via -r requirements/pip-tools.txt -platformdirs==3.10.0 +platformdirs==3.11.0 # via # -r requirements/validation.txt # pylint @@ -393,9 +393,9 @@ pycparser==2.21 # via # -r requirements/validation.txt # cffi -pydantic==2.3.0 +pydantic==2.4.2 # via inflect -pydantic-core==2.6.3 +pydantic-core==2.10.1 # via pydantic pydocstyle==6.3.0 # via -r requirements/validation.txt @@ -481,7 +481,7 @@ pyyaml==6.0.1 # code-annotations # drf-yasg # edx-i18n-tools -redis==5.0.0 +redis==5.0.1 # via -r requirements/validation.txt requests==2.31.0 # via @@ -498,7 +498,7 @@ requests-oauthlib==1.3.1 # social-auth-core rules==3.3 # via -r requirements/validation.txt -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/validation.txt # boto3 @@ -590,7 +590,7 @@ uritemplate==4.1.1 # via # -r requirements/validation.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -r requirements/validation.txt # botocore @@ -601,7 +601,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.8 # via # -r requirements/validation.txt # prompt-toolkit diff --git a/requirements/doc.txt b/requirements/doc.txt index 1b16061c..d49e66de 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -28,7 +28,7 @@ async-timeout==4.0.3 # via # -r requirements/test.txt # redis -babel==2.12.1 +babel==2.13.0 # via # pydata-sphinx-theme # sphinx @@ -48,11 +48,11 @@ billiard==4.1.0 # via # -r requirements/test.txt # celery -boto3==1.28.51 +boto3==1.28.59 # via # -r requirements/test.txt # django-ses -botocore==1.31.51 +botocore==1.31.59 # via # -r requirements/test.txt # boto3 @@ -66,12 +66,12 @@ certifi==2023.7.22 # via # -r requirements/test.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/test.txt # requests @@ -107,7 +107,7 @@ code-annotations==1.5.0 # -r requirements/test.txt # edx-lint # edx-toggles -coverage[toml]==7.3.1 +coverage[toml]==7.3.2 # via # -r requirements/test.txt # pytest-cov @@ -118,7 +118,7 @@ cryptography==41.0.4 # social-auth-core ddt==1.6.0 # via -r requirements/test.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # -r requirements/test.txt # python3-openid @@ -243,7 +243,7 @@ edx-lint==5.2.5 # via # -c requirements/constraints.txt # -r requirements/test.txt -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/test.txt # edx-drf-extensions @@ -259,7 +259,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.6.1 +faker==19.6.2 # via # -r requirements/test.txt # factory-boy @@ -321,7 +321,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/test.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/test.txt # edx-django-utils @@ -332,7 +332,7 @@ oauthlib==3.2.2 # -r requirements/test.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/test.txt # drf-yasg @@ -343,7 +343,7 @@ pbr==5.11.1 # via # -r requirements/test.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via # -r requirements/test.txt # pylint @@ -367,7 +367,7 @@ pycparser==2.21 # via # -r requirements/test.txt # cffi -pydata-sphinx-theme==0.14.0 +pydata-sphinx-theme==0.14.1 # via sphinx-book-theme pygments==2.16.1 # via @@ -452,7 +452,7 @@ pyyaml==6.0.1 # drf-yasg readme-renderer==42.0 # via -r requirements/doc.in -redis==5.0.0 +redis==5.0.1 # via -r requirements/test.txt requests==2.31.0 # via @@ -472,7 +472,7 @@ restructuredtext-lint==1.4.0 # via doc8 rules==3.3 # via -r requirements/test.txt -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/test.txt # boto3 @@ -576,7 +576,7 @@ uritemplate==4.1.1 # via # -r requirements/test.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -r requirements/test.txt # botocore @@ -587,7 +587,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.8 # via # -r requirements/test.txt # prompt-toolkit diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 894fa179..50d35f22 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -10,7 +10,7 @@ click==8.1.7 # via pip-tools importlib-metadata==6.8.0 # via build -packaging==23.1 +packaging==23.2 # via build pip-tools==7.3.0 # via -r requirements/pip-tools.in diff --git a/requirements/production.txt b/requirements/production.txt index fd459c2b..c4e55aa6 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -32,11 +32,11 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.51 +boto3==1.28.59 # via # -r requirements/base.txt # django-ses -botocore==1.31.51 +botocore==1.31.59 # via # -r requirements/base.txt # boto3 @@ -50,12 +50,12 @@ certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/base.txt # requests @@ -89,7 +89,7 @@ cryptography==41.0.4 # -r requirements/base.txt # pyjwt # social-auth-core -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # -r requirements/base.txt # python3-openid @@ -195,7 +195,7 @@ edx-drf-extensions==8.10.0 # via # -r requirements/base.txt # edx-rbac -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions @@ -207,7 +207,7 @@ edx-toggles==5.1.0 # via -r requirements/base.txt gevent==23.9.1 # via -r requirements/production.in -greenlet==2.0.2 +greenlet==3.0.0 # via gevent gunicorn==21.2.0 # via -r requirements/production.in @@ -246,7 +246,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -255,7 +255,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/base.txt # drf-yasg @@ -326,7 +326,7 @@ pyyaml==6.0.1 # -r requirements/production.in # code-annotations # drf-yasg -redis==5.0.0 +redis==5.0.1 # via -r requirements/base.txt requests==2.31.0 # via @@ -343,7 +343,7 @@ requests-oauthlib==1.3.1 # social-auth-core rules==3.3 # via -r requirements/base.txt -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/base.txt # boto3 @@ -408,7 +408,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -r requirements/base.txt # botocore @@ -419,7 +419,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.8 # via # -r requirements/base.txt # prompt-toolkit diff --git a/requirements/quality.txt b/requirements/quality.txt index fcd13204..60d6a3f4 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -37,11 +37,11 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.51 +boto3==1.28.59 # via # -r requirements/base.txt # django-ses -botocore==1.31.51 +botocore==1.31.59 # via # -r requirements/base.txt # boto3 @@ -55,12 +55,12 @@ certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/base.txt # requests @@ -99,7 +99,7 @@ cryptography==41.0.4 # -r requirements/base.txt # pyjwt # social-auth-core -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # -r requirements/base.txt # python3-openid @@ -211,7 +211,7 @@ edx-lint==5.2.5 # via # -c requirements/constraints.txt # -r requirements/quality.in -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions @@ -264,7 +264,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -273,7 +273,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/base.txt # drf-yasg @@ -281,7 +281,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via pylint ply==3.11 # via @@ -359,7 +359,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # code-annotations # drf-yasg -redis==5.0.0 +redis==5.0.1 # via -r requirements/base.txt requests==2.31.0 # via @@ -376,7 +376,7 @@ requests-oauthlib==1.3.1 # social-auth-core rules==3.3 # via -r requirements/base.txt -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/base.txt # boto3 @@ -449,7 +449,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -r requirements/base.txt # botocore @@ -460,7 +460,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.8 # via # -r requirements/base.txt # prompt-toolkit diff --git a/requirements/test.txt b/requirements/test.txt index 2d7352cc..13b4d6da 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -37,11 +37,11 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.51 +boto3==1.28.59 # via # -r requirements/base.txt # django-ses -botocore==1.31.51 +botocore==1.31.59 # via # -r requirements/base.txt # boto3 @@ -55,12 +55,12 @@ certifi==2023.7.22 # via # -r requirements/base.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/base.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/base.txt # requests @@ -95,7 +95,7 @@ code-annotations==1.5.0 # -r requirements/test.in # edx-lint # edx-toggles -coverage[toml]==7.3.1 +coverage[toml]==7.3.2 # via # -r requirements/test.in # pytest-cov @@ -106,7 +106,7 @@ cryptography==41.0.4 # social-auth-core ddt==1.6.0 # via -r requirements/test.in -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # -r requirements/base.txt # python3-openid @@ -220,7 +220,7 @@ edx-lint==5.2.5 # via # -c requirements/constraints.txt # -r requirements/test.in -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/base.txt # edx-drf-extensions @@ -234,7 +234,7 @@ exceptiongroup==1.1.3 # via pytest factory-boy==3.3.0 # via -r requirements/test.in -faker==19.6.1 +faker==19.6.2 # via factory-boy freezegun==1.2.2 # via -r requirements/test.in @@ -281,7 +281,7 @@ monotonic==1.6 # analytics-python mysqlclient==2.2.0 # via -r requirements/base.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -290,7 +290,7 @@ oauthlib==3.2.2 # -r requirements/base.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/base.txt # drf-yasg @@ -299,7 +299,7 @@ pbr==5.11.1 # via # -r requirements/base.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via pylint pluggy==1.3.0 # via pytest @@ -385,7 +385,7 @@ pyyaml==6.0.1 # -r requirements/base.txt # code-annotations # drf-yasg -redis==5.0.0 +redis==5.0.1 # via -r requirements/base.txt requests==2.31.0 # via @@ -402,7 +402,7 @@ requests-oauthlib==1.3.1 # social-auth-core rules==3.3 # via -r requirements/base.txt -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/base.txt # boto3 @@ -477,7 +477,7 @@ uritemplate==4.1.1 # via # -r requirements/base.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -r requirements/base.txt # botocore @@ -488,7 +488,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.8 # via # -r requirements/base.txt # prompt-toolkit diff --git a/requirements/validation.txt b/requirements/validation.txt index 961755c2..806f002c 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -47,12 +47,12 @@ billiard==4.1.0 # -r requirements/quality.txt # -r requirements/test.txt # celery -boto3==1.28.51 +boto3==1.28.59 # via # -r requirements/quality.txt # -r requirements/test.txt # django-ses -botocore==1.31.51 +botocore==1.31.59 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -69,13 +69,13 @@ certifi==2023.7.22 # -r requirements/quality.txt # -r requirements/test.txt # requests -cffi==1.15.1 +cffi==1.16.0 # via # -r requirements/quality.txt # -r requirements/test.txt # cryptography # pynacl -charset-normalizer==3.2.0 +charset-normalizer==3.3.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -118,7 +118,7 @@ code-annotations==1.5.0 # -r requirements/test.txt # edx-lint # edx-toggles -coverage[toml]==7.3.1 +coverage[toml]==7.3.2 # via # -r requirements/test.txt # pytest-cov @@ -130,7 +130,7 @@ cryptography==41.0.4 # social-auth-core ddt==1.6.0 # via -r requirements/test.txt -defusedxml==0.7.1 +defusedxml==0.8.0rc2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -291,7 +291,7 @@ edx-lint==5.2.5 # -c requirements/constraints.txt # -r requirements/quality.txt # -r requirements/test.txt -edx-opaque-keys==2.5.0 +edx-opaque-keys==2.5.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -314,7 +314,7 @@ exceptiongroup==1.1.3 # pytest factory-boy==3.3.0 # via -r requirements/test.txt -faker==19.6.1 +faker==19.6.2 # via # -r requirements/test.txt # factory-boy @@ -384,7 +384,7 @@ mysqlclient==2.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -newrelic==9.0.0 +newrelic==9.1.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -395,7 +395,7 @@ oauthlib==3.2.2 # -r requirements/test.txt # requests-oauthlib # social-auth-core -packaging==23.1 +packaging==23.2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -410,7 +410,7 @@ pbr==5.11.1 # -r requirements/quality.txt # -r requirements/test.txt # stevedore -platformdirs==3.10.0 +platformdirs==3.11.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -531,7 +531,7 @@ pyyaml==6.0.1 # code-annotations # drf-yasg # edx-i18n-tools -redis==5.0.0 +redis==5.0.1 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -554,7 +554,7 @@ rules==3.3 # via # -r requirements/quality.txt # -r requirements/test.txt -s3transfer==0.6.2 +s3transfer==0.7.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -654,7 +654,7 @@ uritemplate==4.1.1 # -r requirements/quality.txt # -r requirements/test.txt # drf-yasg -urllib3==1.26.16 +urllib3==1.26.17 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -667,7 +667,7 @@ vine==5.0.0 # amqp # celery # kombu -wcwidth==0.2.6 +wcwidth==0.2.8 # via # -r requirements/quality.txt # -r requirements/test.txt From 41c9131d5943f3733c52c983b08ebd7cb7c6b3bf Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed Date: Wed, 4 Oct 2023 19:12:56 +0500 Subject: [PATCH 4/7] fix: use sed command with -i flag in upgrade target --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 080eff34..0a85ea9b 100644 --- a/Makefile +++ b/Makefile @@ -114,10 +114,8 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil # This is a temporary solution to override the real common_constraints.txt # In edx-lint, until the pyjwt constraint in edx-lint has been removed. # See BOM-271 for more details. - sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt + sed -i '' 's/Django<4.0//g' requirements/common_constraints.txt + sed -i '' 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt # Make sure to compile files after any other files they include! pip-compile --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in From 161c129d6201cd5339a051eae69ae07a7f723c73 Mon Sep 17 00:00:00 2001 From: Muhammad Soban Javed Date: Wed, 4 Oct 2023 19:23:37 +0500 Subject: [PATCH 5/7] fix: use .tmp in -i flag for sed command in upgrade --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0a85ea9b..18316a9c 100644 --- a/Makefile +++ b/Makefile @@ -114,8 +114,8 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil # This is a temporary solution to override the real common_constraints.txt # In edx-lint, until the pyjwt constraint in edx-lint has been removed. # See BOM-271 for more details. - sed -i '' 's/Django<4.0//g' requirements/common_constraints.txt - sed -i '' 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt + sed -i.tmp 's/Django<4.0//g' requirements/common_constraints.txt + sed -i.tmp 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt # Make sure to compile files after any other files they include! pip-compile --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in From 2da0074c0fec4a58409f48539983570351bbf74f Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 5 Oct 2023 17:15:23 +0500 Subject: [PATCH 6/7] refactor: update common_constraints override --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 18316a9c..f4bf1700 100644 --- a/Makefile +++ b/Makefile @@ -114,8 +114,8 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil # This is a temporary solution to override the real common_constraints.txt # In edx-lint, until the pyjwt constraint in edx-lint has been removed. # See BOM-271 for more details. - sed -i.tmp 's/Django<4.0//g' requirements/common_constraints.txt - sed -i.tmp 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt + sed -i.'' 's/Django<4.0//g' requirements/common_constraints.txt + sed -i.'' 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt # Make sure to compile files after any other files they include! pip-compile --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in From 69cf64b622d6d22de6bc0fa655dd5932374ccb46 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Thu, 5 Oct 2023 08:21:17 -0400 Subject: [PATCH 7/7] chore: Updating Python Requirements --- requirements/base.txt | 6 +++--- requirements/dev.txt | 6 +++--- requirements/doc.txt | 6 +++--- requirements/production.txt | 8 ++++---- requirements/quality.txt | 6 +++--- requirements/test.txt | 6 +++--- requirements/validation.txt | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 88dfb151..c2d4242e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -23,9 +23,9 @@ backports-zoneinfo[tzdata]==0.2.1 # kombu billiard==4.1.0 # via celery -boto3==1.28.59 +boto3==1.28.60 # via django-ses -botocore==1.31.59 +botocore==1.31.60 # via # boto3 # s3transfer @@ -66,7 +66,7 @@ defusedxml==0.8.0rc2 # via # python3-openid # social-auth-core -django==4.2.5 +django==4.2.6 # via # -c requirements/constraints.txt # -r requirements/base.in diff --git a/requirements/dev.txt b/requirements/dev.txt index 38b461af..799f1042 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -40,11 +40,11 @@ billiard==4.1.0 # via # -r requirements/validation.txt # celery -boto3==1.28.59 +boto3==1.28.60 # via # -r requirements/validation.txt # django-ses -botocore==1.31.59 +botocore==1.31.60 # via # -r requirements/validation.txt # boto3 @@ -131,7 +131,7 @@ dill==0.3.7 # via # -r requirements/validation.txt # pylint -django==4.2.5 +django==4.2.6 # via # -c requirements/constraints.txt # -r requirements/validation.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index d49e66de..8a989ab6 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -48,11 +48,11 @@ billiard==4.1.0 # via # -r requirements/test.txt # celery -boto3==1.28.59 +boto3==1.28.60 # via # -r requirements/test.txt # django-ses -botocore==1.31.59 +botocore==1.31.60 # via # -r requirements/test.txt # boto3 @@ -127,7 +127,7 @@ dill==0.3.7 # via # -r requirements/test.txt # pylint -django==4.2.5 +django==4.2.6 # via # -c requirements/constraints.txt # -r requirements/test.txt diff --git a/requirements/production.txt b/requirements/production.txt index c4e55aa6..6febee7e 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -32,11 +32,11 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.59 +boto3==1.28.60 # via # -r requirements/base.txt # django-ses -botocore==1.31.59 +botocore==1.31.60 # via # -r requirements/base.txt # boto3 @@ -94,7 +94,7 @@ defusedxml==0.8.0rc2 # -r requirements/base.txt # python3-openid # social-auth-core -django==4.2.5 +django==4.2.6 # via # -c requirements/constraints.txt # -r requirements/base.txt @@ -427,7 +427,7 @@ zipp==3.17.0 # via -r requirements/base.txt zope-event==5.0 # via gevent -zope-interface==6.0 +zope-interface==6.1 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/quality.txt b/requirements/quality.txt index 60d6a3f4..60c38276 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -37,11 +37,11 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.59 +boto3==1.28.60 # via # -r requirements/base.txt # django-ses -botocore==1.31.59 +botocore==1.31.60 # via # -r requirements/base.txt # boto3 @@ -106,7 +106,7 @@ defusedxml==0.8.0rc2 # social-auth-core dill==0.3.7 # via pylint -django==4.2.5 +django==4.2.6 # via # -c requirements/constraints.txt # -r requirements/base.txt diff --git a/requirements/test.txt b/requirements/test.txt index 13b4d6da..b596031c 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -37,11 +37,11 @@ billiard==4.1.0 # via # -r requirements/base.txt # celery -boto3==1.28.59 +boto3==1.28.60 # via # -r requirements/base.txt # django-ses -botocore==1.31.59 +botocore==1.31.60 # via # -r requirements/base.txt # boto3 @@ -113,7 +113,7 @@ defusedxml==0.8.0rc2 # social-auth-core dill==0.3.7 # via pylint -django==4.2.5 +django==4.2.6 # via # -c requirements/constraints.txt # -r requirements/base.txt diff --git a/requirements/validation.txt b/requirements/validation.txt index 806f002c..cd290fff 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -47,12 +47,12 @@ billiard==4.1.0 # -r requirements/quality.txt # -r requirements/test.txt # celery -boto3==1.28.59 +boto3==1.28.60 # via # -r requirements/quality.txt # -r requirements/test.txt # django-ses -botocore==1.31.59 +botocore==1.31.60 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -141,7 +141,7 @@ dill==0.3.7 # -r requirements/quality.txt # -r requirements/test.txt # pylint -django==4.2.5 +django==4.2.6 # via # -c requirements/constraints.txt # -r requirements/quality.txt