From 54d23b56df50a3fa230759c8fb117957da20a349 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 26 Jan 2023 13:55:34 -0500 Subject: [PATCH] 2.0 prep still waiting on two more gerrits but this will set things up Change-Id: I966d4c683972c5b965b8db136509062cc8abfe91 --- doc/build/changelog/changelog_20.rst | 2 +- doc/build/changelog/unreleased_14/5047.rst | 2 +- doc/build/changelog/unreleased_14/7664.rst | 2 +- doc/build/changelog/unreleased_14/9133.rst | 2 +- doc/build/changelog/unreleased_20/7305.rst | 2 +- doc/build/changelog/unreleased_20/more_typing.rst | 2 +- lib/sqlalchemy/__init__.py | 2 +- lib/sqlalchemy/util/langhelpers.py | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/build/changelog/changelog_20.rst b/doc/build/changelog/changelog_20.rst index f4c1f825e1..b939c86571 100644 --- a/doc/build/changelog/changelog_20.rst +++ b/doc/build/changelog/changelog_20.rst @@ -9,7 +9,7 @@ .. changelog:: - :version: 2.0.0rc4 + :version: 2.0.0 :include_notes_from: unreleased_20 .. changelog:: diff --git a/doc/build/changelog/unreleased_14/5047.rst b/doc/build/changelog/unreleased_14/5047.rst index 0df68dec80..a0186c1116 100644 --- a/doc/build/changelog/unreleased_14/5047.rst +++ b/doc/build/changelog/unreleased_14/5047.rst @@ -1,7 +1,7 @@ .. change:: :tags: bug, oracle :tickets: 5047 - :versions: 2.0.0rc4 + :versions: 2.0.0 Added :class:`_oracle.ROWID` to reflected types as this type may be used in a "CREATE TABLE" statement. diff --git a/doc/build/changelog/unreleased_14/7664.rst b/doc/build/changelog/unreleased_14/7664.rst index ecee43eb1a..5e4ae56890 100644 --- a/doc/build/changelog/unreleased_14/7664.rst +++ b/doc/build/changelog/unreleased_14/7664.rst @@ -1,7 +1,7 @@ .. change:: :tags: bug, sql :tickets: 7664 - :versions: 2.0.0rc4 + :versions: 2.0.0 Fixed stringify for a the :class:`.CreateSchema` DDL construct, which would fail with an ``AttributeError`` when stringified without a dialect. diff --git a/doc/build/changelog/unreleased_14/9133.rst b/doc/build/changelog/unreleased_14/9133.rst index 6fda782e83..e20a12a4b1 100644 --- a/doc/build/changelog/unreleased_14/9133.rst +++ b/doc/build/changelog/unreleased_14/9133.rst @@ -1,7 +1,7 @@ .. change:: :tags: bug, mssql :tickets: 9133 - :versions: 2.0.0rc4 + :versions: 2.0.0 Fixed bug where a schema name given with brackets, but no dots inside the name, for parameters such as :paramref:`_schema.Table.schema` would not be diff --git a/doc/build/changelog/unreleased_20/7305.rst b/doc/build/changelog/unreleased_20/7305.rst index 5b71f05646..b9ea96fd2b 100644 --- a/doc/build/changelog/unreleased_20/7305.rst +++ b/doc/build/changelog/unreleased_20/7305.rst @@ -1,5 +1,5 @@ .. change:: - :tags: utils, bug + :tags: orm, bug :tickets: 7305 Improved the notification of warnings that are emitted within the configure diff --git a/doc/build/changelog/unreleased_20/more_typing.rst b/doc/build/changelog/unreleased_20/more_typing.rst index f7b1ba258d..d01c1547f3 100644 --- a/doc/build/changelog/unreleased_20/more_typing.rst +++ b/doc/build/changelog/unreleased_20/more_typing.rst @@ -3,7 +3,7 @@ :tickets: 9122 The :meth:`_sql.ColumnOperators.in_` and - :meth:`_sql.ColumnOperators.not_in_` are typed to include + :meth:`_sql.ColumnOperators.not_in` methods are typed to include ``Iterable[Any]`` rather than ``Sequence[Any]`` for more flexibility in argument type. diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py index f7b287902d..5fe9d89063 100644 --- a/lib/sqlalchemy/__init__.py +++ b/lib/sqlalchemy/__init__.py @@ -259,7 +259,7 @@ from .types import Uuid as Uuid from .types import VARBINARY as VARBINARY from .types import VARCHAR as VARCHAR -__version__ = "2.0.0rc4" +__version__ = "2.0.0" def __go(lcls: Any) -> None: diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py index 01f083bec2..b15d554fc9 100644 --- a/lib/sqlalchemy/util/langhelpers.py +++ b/lib/sqlalchemy/util/langhelpers.py @@ -1877,9 +1877,9 @@ def _warnings_warn( if frame.f_code in _warning_tags: warning_tag_found = True - (_prefix, _category) = _warning_tags[frame.f_code] + (_suffix, _category) = _warning_tags[frame.f_code] category = category or _category - message = f"{message} ({_prefix})" + message = f"{message} ({_suffix})" frame = frame.f_back # type: ignore[assignment] -- 2.47.2