From: Yurii Karabas <1998uriyyo@gmail.com>
Date: Tue, 14 Nov 2023 17:17:07 +0000 (+0200)
Subject: merge with upstream/main
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d236f544ae33a4c16a94731f9b8ed842e8d6eea6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge with upstream/main
---

d236f544ae33a4c16a94731f9b8ed842e8d6eea6
diff --cc tox.ini
index 1cb44a1a3d,d11a882029..b41cd4e62e
--- a/tox.ini
+++ b/tox.ini
@@@ -175,7 -175,8 +175,8 @@@ commands
  [testenv:pep484]
  deps=
       greenlet != 0.4.17
 -     mypy >= 1.6.0
 +     mypy >= 1.7.0
+      types-greenlet
  commands =
      mypy  {env:MYPY_COLOR} ./lib/sqlalchemy
      # pyright changes too often with not-exactly-correct errors
@@@ -187,9 -188,9 +188,9 @@@ deps
       pytest>=7.0.0rc1,<8
       pytest-xdist
       greenlet != 0.4.17
 -     mypy >= 1.2.0
 +     mypy >= 1.7.0
       patch==1.*
- 
+      types-greenlet
  commands =
      pytest {env:PYTEST_COLOR} -m mypy {posargs}