From 1eab2a7e37ed36aa997a075622bc429009f927c5 Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Thu, 19 Oct 2023 16:36:32 +0200 Subject: [PATCH] Bump the `pymysql` version to 1.1.0 on Python 3 (#16042) --- cacti/CHANGELOG.md | 4 ++++ cacti/pyproject.toml | 3 ++- datadog_checks_base/CHANGELOG.md | 1 + .../datadog_checks/base/data/agent_requirements.in | 3 ++- mysql/CHANGELOG.md | 4 ++++ mysql/hatch.toml | 2 +- mysql/pyproject.toml | 3 ++- proxysql/CHANGELOG.md | 4 ++++ proxysql/pyproject.toml | 3 ++- singlestore/CHANGELOG.md | 4 ++++ singlestore/hatch.toml | 2 +- singlestore/pyproject.toml | 3 ++- 12 files changed, 29 insertions(+), 7 deletions(-) diff --git a/cacti/CHANGELOG.md b/cacti/CHANGELOG.md index de37b9259825a..68581bc66813f 100644 --- a/cacti/CHANGELOG.md +++ b/cacti/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Fixed***: + +* Bump the `pymysql` version to 1.1.0 on Python 3 ([#16042](https://github.com/DataDog/integrations-core/pull/16042)) + ## 2.0.0 / 2023-08-10 / Agent 7.48.0 ***Changed***: diff --git a/cacti/pyproject.toml b/cacti/pyproject.toml index c6ff95e682a63..84b5c97aae87a 100644 --- a/cacti/pyproject.toml +++ b/cacti/pyproject.toml @@ -39,7 +39,8 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pymysql==0.10.1", + "pymysql==0.10.1; python_version < '3.0'", + "pymysql==1.1.0; python_version > '3.0'", ] [project.urls] diff --git a/datadog_checks_base/CHANGELOG.md b/datadog_checks_base/CHANGELOG.md index d11e240c0e6ce..d3ea0d6036f3f 100644 --- a/datadog_checks_base/CHANGELOG.md +++ b/datadog_checks_base/CHANGELOG.md @@ -5,6 +5,7 @@ ***Fixed***: * Bump the `pyodbc` version to 4.0.39 ([#16021](https://github.com/DataDog/integrations-core/pull/16021)) +* Bump the `pymysql` version to 1.1.0 on Python 3 ([#16042](https://github.com/DataDog/integrations-core/pull/16042)) ## 34.0.1 / 2023-10-17 diff --git a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in index 100581c0e6a15..2ebbf1b279861 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -67,7 +67,8 @@ pyjwt==1.7.1; python_version < '3.0' pyjwt==2.8.0; python_version > '3.0' pymongo[srv]==4.3.3; python_version >= '3.9' pymqi==1.12.10; sys_platform != 'darwin' or platform_machine != 'arm64' -pymysql==0.10.1 +pymysql==0.10.1; python_version < '3.0' +pymysql==1.1.0; python_version > '3.0' pyodbc==4.0.39; sys_platform != 'darwin' or platform_machine != 'arm64' pyro4==4.82; sys_platform == 'win32' pysmi==0.3.4 diff --git a/mysql/CHANGELOG.md b/mysql/CHANGELOG.md index 213ca4f52f714..a2518f10585c2 100644 --- a/mysql/CHANGELOG.md +++ b/mysql/CHANGELOG.md @@ -6,6 +6,10 @@ * Add support for reporting SQL obfuscation errors ([#15990](https://github.com/DataDog/integrations-core/pull/15990)) +***Fixed***: + +* Bump the `pymysql` version to 1.1.0 on Python 3 ([#16042](https://github.com/DataDog/integrations-core/pull/16042)) + ## 11.2.0 / 2023-09-29 ***Added***: diff --git a/mysql/hatch.toml b/mysql/hatch.toml index 58960fdbb2040..7f9c1660377b3 100644 --- a/mysql/hatch.toml +++ b/mysql/hatch.toml @@ -11,7 +11,7 @@ mypy-args = [ mypy-deps = [ "types-cachetools==0.1.10", "types-enum34==1.1.1", - "types-pymysql==1.0.4", + "types-pymysql==1.1.0.1", ] [[envs.default.matrix]] diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml index 872caefbeeaa1..e7ee3c956193e 100644 --- a/mysql/pyproject.toml +++ b/mysql/pyproject.toml @@ -44,7 +44,8 @@ deps = [ "cryptography==3.3.2; python_version < '3.0'", "cryptography==41.0.4; python_version > '3.0'", "futures==3.4.0; python_version < '3.0'", - "pymysql==0.10.1", + "pymysql==0.10.1; python_version < '3.0'", + "pymysql==1.1.0; python_version > '3.0'", ] [project.urls] diff --git a/proxysql/CHANGELOG.md b/proxysql/CHANGELOG.md index 7e51a7720aa81..24317115c39bb 100644 --- a/proxysql/CHANGELOG.md +++ b/proxysql/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Fixed***: + +* Bump the `pymysql` version to 1.1.0 on Python 3 ([#16042](https://github.com/DataDog/integrations-core/pull/16042)) + ## 5.0.0 / 2023-08-10 / Agent 7.48.0 ***Changed***: diff --git a/proxysql/pyproject.toml b/proxysql/pyproject.toml index 31513b653250c..fc3fd9814f171 100644 --- a/proxysql/pyproject.toml +++ b/proxysql/pyproject.toml @@ -39,7 +39,8 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pymysql==0.10.1", + "pymysql==0.10.1; python_version < '3.0'", + "pymysql==1.1.0; python_version > '3.0'", ] [project.urls] diff --git a/singlestore/CHANGELOG.md b/singlestore/CHANGELOG.md index ad8a69ca8ec5b..f5e5cf0b00850 100644 --- a/singlestore/CHANGELOG.md +++ b/singlestore/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +***Fixed***: + +* Bump the `pymysql` version to 1.1.0 on Python 3 ([#16042](https://github.com/DataDog/integrations-core/pull/16042)) + ## 2.0.0 / 2023-08-10 / Agent 7.48.0 ***Changed***: diff --git a/singlestore/hatch.toml b/singlestore/hatch.toml index 7f113664cf14b..a68a99a85a98c 100644 --- a/singlestore/hatch.toml +++ b/singlestore/hatch.toml @@ -9,7 +9,7 @@ mypy-args = [ "datadog_checks/singlestore", ] mypy-deps = [ - "types-PyMySQL==1.0.4", + "types-PyMySQL==1.1.0.1", ] [[envs.default.matrix]] diff --git a/singlestore/pyproject.toml b/singlestore/pyproject.toml index 3c7f39497afcb..4b305d880a33b 100644 --- a/singlestore/pyproject.toml +++ b/singlestore/pyproject.toml @@ -39,7 +39,8 @@ dynamic = [ [project.optional-dependencies] deps = [ - "pymysql==0.10.1", + "pymysql==0.10.1; python_version < '3.0'", + "pymysql==1.1.0; python_version > '3.0'", ] [project.urls]