From 6a924b74ddbc03089de0b733c9579eed384fef56 Mon Sep 17 00:00:00 2001 From: UsamaSadiq <41958659+UsamaSadiq@users.noreply.github.com> Date: Mon, 16 Nov 2026 15:11:54 +0000 Subject: [PATCH] feat: Upgrade Python dependency mysqlclient Temporarily bring us back to 2.3.0 until the fix in 2.3.1 is superseded. See https://github.com/openedx/edx-lint/issues/590 Commit generated by workflow `openedx/openedx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master` --- pyproject.toml | 1 + requirements/edx-sandbox/pyproject.toml | 1 + requirements/edx-sandbox/uv.lock | 1 + requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- scripts/structures_pruning/pyproject.toml | 1 + scripts/structures_pruning/uv.lock | 1 + scripts/user_retirement/pyproject.toml | 1 + scripts/user_retirement/uv.lock | 1 + scripts/xblock/pyproject.toml | 1 + scripts/xblock/uv.lock | 1 + uv.lock | 33 ++++++++++++----------- 12 files changed, 28 insertions(+), 18 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index dfc0c518d9b4..c2c4cc838995 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -270,6 +270,7 @@ constraint-dependencies = [ "social-auth-app-django<=5.4.1", "social-auth-core<5.0.0", "pip<=26.2.2", + "mysqlclient!=2.3.1", "celery>=5.2.2,!=5.6.1,<6.0.0", "django-oauth-toolkit==1.7.1", "django-stubs<6", diff --git a/requirements/edx-sandbox/pyproject.toml b/requirements/edx-sandbox/pyproject.toml index 6da86f7a5429..27df84f456b5 100644 --- a/requirements/edx-sandbox/pyproject.toml +++ b/requirements/edx-sandbox/pyproject.toml @@ -33,6 +33,7 @@ constraint-dependencies = [ "social-auth-app-django<6.0.0", "social-auth-core<5.0.0", "pip<=26.2.2", + "mysqlclient!=2.3.1", "numpy<2.0.0", "lxml==5.3.2", "setuptools<82", diff --git a/requirements/edx-sandbox/uv.lock b/requirements/edx-sandbox/uv.lock index 94592b2a3e7d..47cc38623eeb 100644 --- a/requirements/edx-sandbox/uv.lock +++ b/requirements/edx-sandbox/uv.lock @@ -7,6 +7,7 @@ constraints = [ { name = "django", specifier = "<6.0" }, { name = "elasticsearch", specifier = "<7.14.0" }, { name = "lxml", specifier = "==5.3.2" }, + { name = "mysqlclient", specifier = "!=2.3.1" }, { name = "numpy", specifier = "<2.0.0" }, { name = "pip", specifier = "<=26.2.2" }, { name = "setuptools", specifier = "<82" }, diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b530a1ff895d..b173d541eb4c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -800,7 +800,7 @@ multidict==7.2.1 # via # aiohttp # yarl -mysqlclient==2.3.1 +mysqlclient==2.3.0 # via # openedx-forum # openedx-platform diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 6305b7b31b4c..661367e1de81 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -907,7 +907,7 @@ mypy-extensions==1.2.0 # via # isort # mypy -mysqlclient==2.3.1 +mysqlclient==2.3.0 # via # openedx-forum # openedx-platform diff --git a/scripts/structures_pruning/pyproject.toml b/scripts/structures_pruning/pyproject.toml index e67924f94ddd..1edcf72e60f6 100644 --- a/scripts/structures_pruning/pyproject.toml +++ b/scripts/structures_pruning/pyproject.toml @@ -31,4 +31,5 @@ constraint-dependencies = [ "social-auth-app-django<6.0.0", "social-auth-core<5.0.0", "pip<=26.2.2", + "mysqlclient!=2.3.1", ] diff --git a/scripts/structures_pruning/uv.lock b/scripts/structures_pruning/uv.lock index 4787f09ad50d..c35705f54de2 100644 --- a/scripts/structures_pruning/uv.lock +++ b/scripts/structures_pruning/uv.lock @@ -6,6 +6,7 @@ requires-python = ">=3.12" constraints = [ { name = "django", specifier = "<6.0" }, { name = "elasticsearch", specifier = "<7.14.0" }, + { name = "mysqlclient", specifier = "!=2.3.1" }, { name = "pip", specifier = "<=26.2.2" }, { name = "social-auth-app-django", specifier = "<6.0.0" }, { name = "social-auth-core", specifier = "<5.0.0" }, diff --git a/scripts/user_retirement/pyproject.toml b/scripts/user_retirement/pyproject.toml index 8b9f87e9ab3a..727e4d3238b4 100644 --- a/scripts/user_retirement/pyproject.toml +++ b/scripts/user_retirement/pyproject.toml @@ -42,6 +42,7 @@ constraint-dependencies = [ "social-auth-app-django<6.0.0", "social-auth-core<5.0.0", "pip<=26.2.2", + "mysqlclient!=2.3.1", "lxml==5.3.2", ] [tool.edx_lint] diff --git a/scripts/user_retirement/uv.lock b/scripts/user_retirement/uv.lock index bf0230731d7e..fd14c1cd57e0 100644 --- a/scripts/user_retirement/uv.lock +++ b/scripts/user_retirement/uv.lock @@ -11,6 +11,7 @@ constraints = [ { name = "django", specifier = "<6.0" }, { name = "elasticsearch", specifier = "<7.14.0" }, { name = "lxml", specifier = "==5.3.2" }, + { name = "mysqlclient", specifier = "!=2.3.1" }, { name = "pip", specifier = "<=26.2.2" }, { name = "social-auth-app-django", specifier = "<6.0.0" }, { name = "social-auth-core", specifier = "<5.0.0" }, diff --git a/scripts/xblock/pyproject.toml b/scripts/xblock/pyproject.toml index 62512d318106..79894ed8afb1 100644 --- a/scripts/xblock/pyproject.toml +++ b/scripts/xblock/pyproject.toml @@ -21,4 +21,5 @@ constraint-dependencies = [ "social-auth-app-django<6.0.0", "social-auth-core<5.0.0", "pip<=26.2.2", + "mysqlclient!=2.3.1", ] diff --git a/scripts/xblock/uv.lock b/scripts/xblock/uv.lock index 02d9b99240f5..d61de6531641 100644 --- a/scripts/xblock/uv.lock +++ b/scripts/xblock/uv.lock @@ -6,6 +6,7 @@ requires-python = ">=3.12" constraints = [ { name = "django", specifier = "<6.0" }, { name = "elasticsearch", specifier = "<7.14.0" }, + { name = "mysqlclient", specifier = "!=2.3.1" }, { name = "pip", specifier = "<=26.2.2" }, { name = "social-auth-app-django", specifier = "<6.0.0" }, { name = "social-auth-core", specifier = "<5.0.0" }, diff --git a/uv.lock b/uv.lock index 628b4c8db13b..dbb9c19384a3 100644 --- a/uv.lock +++ b/uv.lock @@ -21,6 +21,7 @@ constraints = [ { name = "elasticsearch", specifier = "==7.9.1" }, { name = "libsass", specifier = "==0.10.0" }, { name = "lxml", specifier = "==5.3.2" }, + { name = "mysqlclient", specifier = "!=2.3.1" }, { name = "numpy", specifier = "<2.0.0" }, { name = "openedx-core", specifier = "<2" }, { name = "openedx-forum", specifier = "<0.6.0" }, @@ -4197,22 +4198,22 @@ wheels = [ [[package]] name = "mysqlclient" -version = "2.3.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/02/25/520ec75f668df783ee115b4d15d6d5a9ab0cf4033ac65376301f8e5a7df0/mysqlclient-2.3.1.tar.gz", hash = "sha256:c07e1b83b530fd6c5888259f36afad1980d21fcb33ba97384650dd23c8f73ea8", size = 103022, upload-time = "2026-11-10T10:02:16.975Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/f3/73/39caf4a87544410e559e21a99e35044048dac6a7592a8c2ee38a2e3b8a07/mysqlclient-2.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:1008dc952b6e501b442c78e918ce7216aa0496308e3bcbca63dd3d10608f4b7e", size = 217689, upload-time = "2026-11-10T10:01:59.707Z" }, - { url = "https://files.pythonhosted.org/packages/8b/06/0aff6fe8a397e55f2c4a18d625b3034bdd1e268d67be0928eea52dd4af03/mysqlclient-2.3.1-cp312-cp312-win_arm64.whl", hash = "sha256:0f91115b30a5a9b9deb7f265a6d10859e28099ab1f748430451c284150281997", size = 211801, upload-time = "2026-11-10T10:02:01.141Z" }, - { url = "https://files.pythonhosted.org/packages/19/a5/e18a930a578cd46f22595cfeaca1774cd3711690d00c57b9bdac4892f34f/mysqlclient-2.3.1-cp313-cp313-win_amd64.whl", hash = "sha256:987b514ed469894b68aa4a177da182a28dfa4958399450d0f7e89fb7c1074cf7", size = 217665, upload-time = "2026-11-10T10:02:02.667Z" }, - { url = "https://files.pythonhosted.org/packages/b4/3c/208789a7ba935a8d2de7bd47dab42f382ad8ebc2ff23d9a6525afde82061/mysqlclient-2.3.1-cp313-cp313-win_arm64.whl", hash = "sha256:e0ce44f4993410b7b9eb41ad0d114576edd3ea5f4f9e1152a1b2bf746dfaa96f", size = 211788, upload-time = "2026-11-10T10:02:04.186Z" }, - { url = "https://files.pythonhosted.org/packages/2f/cd/599bd7f8acf6bd572bfe2dbbcbd4c4eb6dae918f4f1031b1f62015d735ec/mysqlclient-2.3.1-cp314-cp314-win_amd64.whl", hash = "sha256:6a35ac1f42f54dc6e24fe765bc285d477ff8f37de75326fd4ae53d33e7171bdc", size = 222693, upload-time = "2026-11-10T10:02:05.641Z" }, - { url = "https://files.pythonhosted.org/packages/ec/68/5065482d3ab4cda8b2ac9b0a263b0152174d1f61bf6d71d8690bdd10787b/mysqlclient-2.3.1-cp314-cp314-win_arm64.whl", hash = "sha256:4a0f0d28b8f77dd2d0fa71f17bea4a9bacd3d988771ad7866661c865aaa782f5", size = 217386, upload-time = "2026-11-10T10:02:07.084Z" }, - { url = "https://files.pythonhosted.org/packages/c6/b3/670e27b9ee13404a428c7e07aede81f54714895b9129fa06bd73633affc1/mysqlclient-2.3.1-cp314-cp314t-win_amd64.whl", hash = "sha256:fa1ce1b6ec87a3bb880b459c181626fcc6bf1e52180ab78ec408147b968538cd", size = 223143, upload-time = "2026-11-10T10:02:08.513Z" }, - { url = "https://files.pythonhosted.org/packages/99/49/cb34c35d52a1f21221849d0171a5d72492b750dc5de5b207fa6d228b20a7/mysqlclient-2.3.1-cp314-cp314t-win_arm64.whl", hash = "sha256:7818f5bb20724a07f2d9da21e415f834bb608d5ff139e52e6880df12c6e65146", size = 217952, upload-time = "2026-11-10T10:02:09.928Z" }, - { url = "https://files.pythonhosted.org/packages/ad/51/1b4f79e2f214937a8889efcf4f6f25cd3269974f5934aab15792d36c11ff/mysqlclient-2.3.1-cp315-cp315-win_amd64.whl", hash = "sha256:c61c397181da7301ce9a775d394539dd93fe5b2ba3ec393cc42cb05c37aa9fe4", size = 222693, upload-time = "2026-11-10T10:02:11.398Z" }, - { url = "https://files.pythonhosted.org/packages/9d/5b/933c030901a22cdb241ba95901d00bd298f968d6d1f27b7ee45fc3fc24bd/mysqlclient-2.3.1-cp315-cp315-win_arm64.whl", hash = "sha256:891148327eda166abb6d9cfcc5f35a8e2ab81804b8836f070d1e126df1e522b8", size = 217377, upload-time = "2026-11-10T10:02:12.741Z" }, - { url = "https://files.pythonhosted.org/packages/74/c9/2fbb3318559e0b89f6809755434806159a33335517129b11365efb17b881/mysqlclient-2.3.1-cp315-cp315t-win_amd64.whl", hash = "sha256:7aee4e672f973879b53efb53d705b7efca7efd64bfe8500c5d294902e0033ab0", size = 223127, upload-time = "2026-11-10T10:02:14.264Z" }, - { url = "https://files.pythonhosted.org/packages/43/31/e0aa2078ee31c44a8cab176dde84abcd00f2cc8aedb381b2d032d35edf25/mysqlclient-2.3.1-cp315-cp315t-win_arm64.whl", hash = "sha256:0d1599dc27d006208291080bab35d0f82cbe6ba23587def7c8ed7daffaed0fe8", size = 217946, upload-time = "2026-11-10T10:02:15.628Z" }, +version = "2.3.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/ef/8f/b9488795d21a76c1520905feba5afb6233f16510797a28b51f2b2688c93e/mysqlclient-2.3.0.tar.gz", hash = "sha256:bea8294964266f6486f1ca514ccfcdbc54d4fe0d32882b38c1d4594df870be8b", size = 102185, upload-time = "2026-09-14T15:38:30.784Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/61/48/5474ffb47d1f27600737ae6b4860fc4bbc17b7e7f1dec9b8b765a75d66e5/mysqlclient-2.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:effb81eb6d1f1df6c1d95f63f117bec5007e9c64487e9fa17d5696f2a5338358", size = 217531, upload-time = "2026-09-14T15:38:17.871Z" }, + { url = "https://files.pythonhosted.org/packages/a3/37/9205f687a60196e77d9bc4dd94fdb3c88a24b5cb920fdaf1acf363791bdd/mysqlclient-2.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:7c3c4b3edcc7dc50d23fb5634e0e82bce8ab7de5b83d03fddc1c9979c18607a4", size = 208548, upload-time = "2026-09-14T15:38:18.884Z" }, + { url = "https://files.pythonhosted.org/packages/1d/12/cf11b4df3ee7ca9957487a5e4c99f33611119b086b1d94e14a2ceb21797e/mysqlclient-2.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:60365cce6765b94eeb621aa0f9505044ec9b4ea191cd68500f0a35b2d6d2758b", size = 217521, upload-time = "2026-09-14T15:38:19.87Z" }, + { url = "https://files.pythonhosted.org/packages/6c/ed/4ef9c56dd78a5b6f4ede1574629e532e3f2b97bdd764a6d172fb7ed20fc4/mysqlclient-2.3.0-cp313-cp313-win_arm64.whl", hash = "sha256:a6beb9ca67a9224ff4b45f7f9118f0932038fa38d59ca2e38ae35b5225984d7d", size = 208546, upload-time = "2026-09-14T15:38:21.073Z" }, + { url = "https://files.pythonhosted.org/packages/6e/5f/f62d1263a942e97ca34ea8bf151c13a638fea7a5a544aa9db3d6dad7671d/mysqlclient-2.3.0-cp314-cp314-win_amd64.whl", hash = "sha256:5d4c53eb9c5625dd68b6fed32c8cf00ba19cd1c3073645dec309a9d16bd029e2", size = 222543, upload-time = "2026-09-14T15:38:22.036Z" }, + { url = "https://files.pythonhosted.org/packages/9d/e5/1de3e1fc27009a6da30a52167e98f52ab4277d089eaff7152f6156745af9/mysqlclient-2.3.0-cp314-cp314-win_arm64.whl", hash = "sha256:cfe14103280d5a4968fe8a3ace2a8939ef68a1d881aec9872d06746106b49f7f", size = 213120, upload-time = "2026-09-14T15:38:23.063Z" }, + { url = "https://files.pythonhosted.org/packages/b3/ea/d7ebc53af9d3341e5c049795ec5e88946d83cbd26ee468475ae0c3b21d7f/mysqlclient-2.3.0-cp314-cp314t-win_amd64.whl", hash = "sha256:673891700dafbc66a6a8df12059b53a65905ec6e8dec615392fb984299880c0d", size = 222969, upload-time = "2026-09-14T15:38:24.168Z" }, + { url = "https://files.pythonhosted.org/packages/4b/42/9ff798c066e33df9f7b58822a3eaf26185c3cb7e61a8186a56243b006066/mysqlclient-2.3.0-cp314-cp314t-win_arm64.whl", hash = "sha256:fe27c63ba9088b28467bf276f93f0b4a9062beabaeeb9692593e774d1146cce2", size = 213680, upload-time = "2026-09-14T15:38:25.259Z" }, + { url = "https://files.pythonhosted.org/packages/d2/0f/29185111b7c0dd264e910c1250f2fd9a452ebad7fb272e750d8ffb18e67c/mysqlclient-2.3.0-cp315-cp315-win_amd64.whl", hash = "sha256:3c601984c286c51080e0d3e9a857bc014713e6338b5f9c0a5df453a341b14022", size = 222537, upload-time = "2026-09-14T15:38:26.308Z" }, + { url = "https://files.pythonhosted.org/packages/32/7b/4a050453adb5d07ee5f979f17409f93be545baae786dd58698f82b08a3e1/mysqlclient-2.3.0-cp315-cp315-win_arm64.whl", hash = "sha256:3d39527a5525b4ebff99721d063f4fe9e459b9e437c7b7698374966d92d4355d", size = 213112, upload-time = "2026-09-14T15:38:27.329Z" }, + { url = "https://files.pythonhosted.org/packages/a2/13/a046e9df6d69778b7de66f3d2ad83e563045992959efafb7b2ef62af0560/mysqlclient-2.3.0-cp315-cp315t-win_amd64.whl", hash = "sha256:24164ba592065ae5ff0149bb5707d05772335935059474fb75d864e5d0f94d63", size = 222969, upload-time = "2026-09-14T15:38:28.468Z" }, + { url = "https://files.pythonhosted.org/packages/f8/13/cf40c2957bebe95fa109feb8a28fe0871ba4bd5e37c77b6128114ec20712/mysqlclient-2.3.0-cp315-cp315t-win_arm64.whl", hash = "sha256:f1ec49f73dad7df8f2da4d9de0f875f03c8bd44fbe77878522204c0646822f63", size = 213723, upload-time = "2026-09-14T15:38:29.69Z" }, ] [[package]]