Merge "include cls locals in annotation evaluate" into main

author Michael Bayer <mike_mp@zzzcomputing.com>

Wed, 7 Feb 2024 00:45:47 +0000 (00:45 +0000)

committer Gerrit Code Review <gerrit@bbpush.zzzcomputing.com>

Wed, 7 Feb 2024 00:45:47 +0000 (00:45 +0000)
author Michael Bayer <mike_mp@zzzcomputing.com>
Wed, 7 Feb 2024 00:45:47 +0000 (00:45 +0000)
committer Gerrit Code Review <gerrit@bbpush.zzzcomputing.com>
Wed, 7 Feb 2024 00:45:47 +0000 (00:45 +0000)
diff --cc lib/sqlalchemy/util/typing.py
Simple merge
diff --cc test/orm/declarative/test_tm_future_annotations_sync.py
Simple merge
diff --cc test/orm/declarative/test_typed_mapping.py
Simple merge
author	Michael Bayer <mike_mp@zzzcomputing.com>
	Wed, 7 Feb 2024 00:45:47 +0000 (00:45 +0000)
committer	Gerrit Code Review <gerrit@bbpush.zzzcomputing.com>
	Wed, 7 Feb 2024 00:45:47 +0000 (00:45 +0000)
		1	2
lib/sqlalchemy/util/typing.py	patch \|	diff1 \|	diff2 \|	blob \| history
test/orm/declarative/test_tm_future_annotations_sync.py	patch \|	diff1 \|	diff2 \|	blob \| history
test/orm/declarative/test_typed_mapping.py	patch \|	diff1 \|	diff2 \|	blob \| history