summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-04-27 17:18:08 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2019-04-27 17:18:08 -0400
commit1fbc5967660f858e4990f99aabad3a69fbc1efae (patch)
tree6df864e42a00191a19b8a6fb26862a1e935112ef
parentbbc11d621a9ed95b785f663d7fe575529a96090f (diff)
downloadsqlalchemy-1fbc5967660f858e4990f99aabad3a69fbc1efae.tar.gz
- initial 1.4 setup
Fixes: #4631 Change-Id: I7ff2ae98be6db571c9dacc75e912488b8a9bbdbb
-rw-r--r--doc/build/changelog/changelog_14.rst13
-rw-r--r--doc/build/changelog/migration_14.rst8
-rw-r--r--doc/build/changelog/unreleased_14/README.txt12
3 files changed, 33 insertions, 0 deletions
diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
new file mode 100644
index 000000000..f1358c1ad
--- /dev/null
+++ b/doc/build/changelog/changelog_14.rst
@@ -0,0 +1,13 @@
+=============
+1.4 Changelog
+=============
+
+.. changelog_imports::
+
+ .. include:: changelog_13.rst
+ :start-line: 5
+
+
+.. changelog::
+ :version: 1.4.0b1
+ :include_notes_from: unreleased_14
diff --git a/doc/build/changelog/migration_14.rst b/doc/build/changelog/migration_14.rst
new file mode 100644
index 000000000..3b92d9308
--- /dev/null
+++ b/doc/build/changelog/migration_14.rst
@@ -0,0 +1,8 @@
+=============================
+What's New in SQLAlchemy 1.4?
+=============================
+
+.. admonition:: About this Document
+
+ This document describes changes between SQLAlchemy version 1.3
+ and SQLAlchemy version 1.4.
diff --git a/doc/build/changelog/unreleased_14/README.txt b/doc/build/changelog/unreleased_14/README.txt
new file mode 100644
index 000000000..1d2b3446e
--- /dev/null
+++ b/doc/build/changelog/unreleased_14/README.txt
@@ -0,0 +1,12 @@
+Individual per-changelog files go here
+in .rst format, which are pulled in by
+changelog (version 0.4.0 or higher) to
+be rendered into the changelog_xx.rst file.
+At release time, the files here are removed and written
+directly into the changelog.
+
+Rationale is so that multiple changes being merged
+into gerrit don't produce conflicts. Note that
+gerrit does not support custom merge handlers unlike
+git itself.
+