From: Mike Bayer Date: Tue, 26 Dec 2017 19:18:27 +0000 (-0500) Subject: - call this 1.2.0 X-Git-Tag: rel_1_2_0~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6498e7a8fd634e824038303b3d182a3d1d801652;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - call this 1.2.0 Change-Id: If8d60e5d44f387eba97fd9bb1dfa85947ce7f42f --- diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index 5a3c78fb30..d1000102cb 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -60,7 +60,7 @@ .. change:: :tags: bug, sql :tickets: 4126 - :versions: 1.2.0b4 + :versions: 1.2.0 Fixed bug where ``__repr__`` of :class:`.ColumnDefault` would fail if the argument were a tuple. Pull request courtesy Nicolas Caniart. @@ -68,7 +68,7 @@ .. change:: :tags: bug, orm, declarative :tickets: 4124 - :versions: 1.2.0b4 + :versions: 1.2.0 Fixed bug where a descriptor that is elsewhere a mapped column or relationship within a hierarchy based on :class:`.AbstractConcreteBase` @@ -91,7 +91,7 @@ .. change:: :tags: bug, orm, ext :tickets: 4116 - :versions: 1.2.0b4 + :versions: 1.2.0 Fixed bug where the association proxy would inadvertently link itself to an :class:`.AliasedClass` object if it were called first with @@ -101,7 +101,7 @@ .. change:: :tags: bug, mysql :tickets: 4120 - :versions: 1.2.0b4 + :versions: 1.2.0 MySQL 5.7.20 now warns for use of the @tx_isolation variable; a version check is now performed and uses @transaction_isolation instead diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst index 2e72321f5a..3dca846fd8 100644 --- a/doc/build/changelog/changelog_12.rst +++ b/doc/build/changelog/changelog_12.rst @@ -11,7 +11,7 @@ :start-line: 5 .. changelog:: - :version: 1.2.0b4 + :version: 1.2.0 :include_notes_from: unreleased_12 .. changelog:: @@ -1202,7 +1202,7 @@ also applies it to all occurrences of the wildcard characters "%" and "_" automatically. Pull request courtesy Diana Clarke. - .. note:: This feature has been changed as of 1.2.0b4 from its initial + .. note:: This feature has been changed as of 1.2.0 from its initial implementation in 1.2.0b2 such that autoescape is now passed as a boolean value, rather than a specific character to use as the escape character. diff --git a/doc/build/changelog/migration_12.rst b/doc/build/changelog/migration_12.rst index c4ae0f9f5d..6d13bc15a1 100644 --- a/doc/build/changelog/migration_12.rst +++ b/doc/build/changelog/migration_12.rst @@ -897,7 +897,7 @@ is used to avoid conflicts with settings like Postgresql's 9.1, and MySQL's ``NO_BACKSLASH_ESCAPES`` settings. The existing "escape" parameter can now be used to change the autoescape character, if desired. -.. note:: This feature has been changed as of 1.2.0b4 from its initial +.. note:: This feature has been changed as of 1.2.0 from its initial implementation in 1.2.0b2 such that autoescape is now passed as a boolean value, rather than a specific character to use as the escape character. diff --git a/doc/build/changelog/unreleased_11/nulls_import.rst b/doc/build/changelog/unreleased_11/nulls_import.rst index c501b22f41..b7619471e9 100644 --- a/doc/build/changelog/unreleased_11/nulls_import.rst +++ b/doc/build/changelog/unreleased_11/nulls_import.rst @@ -1,6 +1,6 @@ .. change:: :tags: bug, sql - :versions: 1.2.0b4 + :versions: 1.2.0 Added :func:`.nullsfirst` and :func:`.nullslast` as top level imports in the ``sqlalchemy.`` and ``sqlalchemy.sql.`` namespace. Pull request diff --git a/doc/build/changelog/unreleased_11/ticket_4136.rst b/doc/build/changelog/unreleased_11/ticket_4136.rst index fa0e084763..c4080f722c 100644 --- a/doc/build/changelog/unreleased_11/ticket_4136.rst +++ b/doc/build/changelog/unreleased_11/ticket_4136.rst @@ -1,7 +1,7 @@ .. change:: :tags: bug, mysql :tickets: 4136 - :versions: 1.2.0b4 + :versions: 1.2.0 Fixed bug where the MySQL "concat" and "match" operators failed to propagate kwargs to the left and right expressions, causing compiler diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py index 61cec68f44..4d280b382e 100644 --- a/lib/sqlalchemy/__init__.py +++ b/lib/sqlalchemy/__init__.py @@ -130,7 +130,7 @@ from .schema import ( from .inspection import inspect from .engine import create_engine, engine_from_config -__version__ = '1.2.0b4' +__version__ = '1.2.0' def __go(lcls): diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py index 0e8dec2a0d..0769391872 100644 --- a/lib/sqlalchemy/sql/operators.py +++ b/lib/sqlalchemy/sql/operators.py @@ -644,7 +644,7 @@ class ColumnOperators(Operators): .. versionadded:: 1.2 - .. versionchanged:: 1.2.0b4 The + .. versionchanged:: 1.2.0 The :paramref:`.ColumnOperators.startswith.autoescape` parameter is now a simple boolean rather than a character; the escape character itself is also escaped, and defaults to a forwards @@ -732,7 +732,7 @@ class ColumnOperators(Operators): .. versionadded:: 1.2 - .. versionchanged:: 1.2.0b4 The + .. versionchanged:: 1.2.0 The :paramref:`.ColumnOperators.endswith.autoescape` parameter is now a simple boolean rather than a character; the escape character itself is also escaped, and defaults to a forwards @@ -820,7 +820,7 @@ class ColumnOperators(Operators): .. versionadded:: 1.2 - .. versionchanged:: 1.2.0b4 The + .. versionchanged:: 1.2.0 The :paramref:`.ColumnOperators.contains.autoescape` parameter is now a simple boolean rather than a character; the escape character itself is also escaped, and defaults to a forwards