From 297f54ac85d0d29ebf353ed736cc6431916c3cb8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 18:16:50 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black-pre-commit-mirror: 23.12.1 → 24.1.1](https://github.com/psf/black-pre-commit-mirror/compare/23.12.1...24.1.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 00b200ac..58002425 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,7 +43,7 @@ repos: - id: django-upgrade args: [--target-version, '3.2'] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.12.1 + rev: 24.1.1 hooks: - id: black - repo: https://github.com/adamchainz/blacken-docs From 1279700328ab5854ec6bf7334fe5f7f8b30bace1 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Thu, 1 Feb 2024 23:06:26 +0000 Subject: [PATCH 2/2] run black --- src/django_mysql/models/functions.py | 8 ++++++-- src/django_mysql/rewrite_query.py | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/django_mysql/models/functions.py b/src/django_mysql/models/functions.py index 138cd4bb..62623f32 100644 --- a/src/django_mysql/models/functions.py +++ b/src/django_mysql/models/functions.py @@ -392,7 +392,8 @@ def __init__( self, expression: ExpressionArgument, to_add: dict[ - str, ExpressionArgument | float | int | dt.date | dt.time | dt.datetime + str, + ExpressionArgument | float | int | dt.date | dt.time | dt.datetime, ], ) -> None: from django_mysql.models.fields import DynamicField @@ -455,5 +456,8 @@ def __init__( raise ValueError(f"Invalid data_type {data_type!r}") super().__init__( - expression, column_name, output_field=output_field, data_type=data_type + expression, + column_name, + output_field=output_field, + data_type=data_type, ) diff --git a/src/django_mysql/rewrite_query.py b/src/django_mysql/rewrite_query.py index da55098a..79d71849 100644 --- a/src/django_mysql/rewrite_query.py +++ b/src/django_mysql/rewrite_query.py @@ -3,6 +3,7 @@ queries and using them to rewrite that query. This is done to support query hints whilst obviating patching Django's ORM in complex ways. """ + from __future__ import annotations import operator