merge with upstream/main

diff --cc tox.ini
index 1cb44a1a3da47ba266bb02012cc44a986c7c079b,d11a88202959d99971cf442a299ba35f83f7056c..b41cd4e62e3dc4397b0dcb1f3e18efde32cac789
--- 1/tox.ini
--- 2/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}