2.0 prep

still waiting on two more gerrits but this will set things up

Change-Id: I966d4c683972c5b965b8db136509062cc8abfe91

diff --git a/doc/build/changelog/changelog_20.rst b/doc/build/changelog/changelog_20.rst
index f4c1f825e18e3a51e4cec6eadf89d9cd0bb5868b..b939c865713ffc7802d32e3fbd5e8634b1e16266 100644 (file)
--- 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 0df68dec80125040eda2829d56f3698020afa333..a0186c111688dfb46a5557350551b79139a374ed 100644 (file)
--- 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 ecee43eb1a671a541065271c855810a007de0ea9..5e4ae56890ae748e48485314e5e37da15d429b9e 100644 (file)
--- 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 6fda782e83f11c6c059bd520bcf825fc21ce92a2..e20a12a4b108c62cc3d433a6a5bc233394eaabdc 100644 (file)
--- 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 5b71f05646cdc77b3de6ce8988564fe053215717..b9ea96fd2bcf074cbd82258733abe854db9f73c7 100644 (file)
--- 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 f7b1ba258da49b22fd9c4e11d0196007c1ad6b00..d01c1547f35cd040e8c372bbc0330facb0699efc 100644 (file)
--- 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 f7b287902d1528679da853c6464c35a080e81b56..5fe9d89063ea495a26389e09de488aa2afaf854b 100644 (file)
--- 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 01f083bec2d21fc86bf4de61e1ebb3c2817a9068..b15d554fc98fd7171352ff4bd6ff5af279c66745 100644 (file)
--- 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]