Merge pull request #366 from openedx/bmtcril/fix_upgrades

Fix make upgrade and update dependencies

Author: sarina

CHANGELOG.rst

@@ -14,8 +14,12 @@ Change Log
 Unreleased
 ----------
 
+2.1.1 - 2026-01-39
+------------------
+* Fix make upgrade, update dependencies
+
 2.1.0 - 2025-04-18
----------------------
+------------------
 * Added Support for ``django 5.2``.
 
 2.0.0 --- 2024-09-09
@@ -28,8 +32,6 @@ Unreleased
 * Add support for python 3.11 and 3.12 support.
 * Removed django32 support.
 
-
-
 1.7.0 --- 2023-07-23
 --------------------
 

Makefile

@@ -62,6 +62,7 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade:  $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	# Make sure to compile files after any other files they include!
 	pip install -qr requirements/pip-tools.txt
+	pip install -qr requirements/pip.txt
 	sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
 	mv requirements/common_constraints.tmp requirements/common_constraints.txt
 	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in

edx_api_doc_tools/__init__.py

@@ -46,4 +46,4 @@
 )
 
 
-__version__ = '2.1.0'
+__version__ = "2.1.1"

requirements/base.txt

@@ -4,33 +4,33 @@
 #
 #    make upgrade
 #
-asgiref==3.8.1
+asgiref==3.11.0
     # via django
-django==4.2.16
+django==5.2.10
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   djangorestframework
     #   drf-yasg
-djangorestframework==3.15.2
+djangorestframework==3.16.1
     # via
     #   -r requirements/base.in
     #   drf-yasg
-drf-yasg==1.21.7
+drf-yasg==1.21.14
     # via -r requirements/base.in
 inflection==0.5.1
     # via drf-yasg
-packaging==24.1
+packaging==26.0
     # via drf-yasg
-pytz==2024.1
+pytz==2025.2
     # via drf-yasg
-pyyaml==6.0.2
+pyyaml==6.0.3
     # via drf-yasg
-sqlparse==0.5.1
+sqlparse==0.5.5
     # via django
-uritemplate==4.1.1
+uritemplate==4.2.0
     # via drf-yasg
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==74.1.2
+setuptools==80.10.2
     # via -r requirements/base.in

requirements/ci.txt

@@ -4,31 +4,31 @@
 #
 #    make upgrade
 #
-cachetools==5.5.0
+cachetools==6.2.6
     # via tox
 chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
-distlib==0.3.8
+distlib==0.4.0
     # via virtualenv
-filelock==3.16.0
+filelock==3.20.3
     # via
     #   tox
     #   virtualenv
-packaging==24.1
+packaging==26.0
     # via
     #   pyproject-api
     #   tox
-platformdirs==4.3.2
+platformdirs==4.5.1
     # via
     #   tox
     #   virtualenv
-pluggy==1.5.0
+pluggy==1.6.0
     # via tox
-pyproject-api==1.7.1
+pyproject-api==1.10.0
     # via tox
-tox==4.18.1
+tox==4.34.1
     # via -r requirements/ci.in
-virtualenv==20.26.4
+virtualenv==20.36.1
     # via tox

requirements/common_constraints.txt

@@ -16,21 +16,10 @@
 # Note: Changes to this file will automatically be used by other repos, referencing
 #  this file from Github directly. It does not require packaging in edx-lint.
 
-
 # using LTS django version
-Django<5.0
+Django<6.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
 # See https://github.com/openedx/edx-platform/issues/35126 for more info
 elasticsearch<7.14.0
-
-# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
-django-simple-history==3.0.0
-
-# Cause: https://github.com/openedx/event-tracking/pull/290
-# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
-# We will pin event-tracking to do not break existing installations
-# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
-# has been resolved and edx-platform is running with pymongo>=4.4.0
-event-tracking<2.4.1