- move to file-per-changelog for unreleased change notes,

so that we no longer have to rely upon merges within
the changelog files.   because gerrit doesn't allow us
to use custom merge engines unlike git, we have no ability
to merge multiple changes into the changelog files without
going through conflicts.   new version of changelog
in git supports these new patterns.

Change-Id: I588eebd027b4ad3428bd522f36a6f1cd77f105bb

diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index 1e00a96e25ae9cef836a4d624809e9b36cc23e46..034c3ae5921c134408c76245a8da97c76546bea6 100644 (file)
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -20,37 +20,7 @@
 
 .. changelog::
     :version: 1.1.12
-
-    .. change:: 4033
-        :tags: bug, orm
-        :tickets: 4033
-        :versions: 1.2.0b2
-
-        Fixed regression from 1.1.11 where adding additional non-entity
-        columns to a query that includes an entity with subqueryload
-        relationships would fail, due to an inspection added in 1.1.11 as a
-        result of :ticket:`4011`.
-
-    .. change:: cache_order_sequence
-        :tags: feature, oracle, posgresql
-        :versions: 1.2.0b1
-
-        Added new keywords :paramref:`.Sequence.cache` and
-        :paramref:`.Sequence.order` to :class:`.Sequence`, to allow rendering
-        of the CACHE parameter understood by Oracle and PostgreSQL, and the
-        ORDER parameter understood by Oracle.  Pull request
-        courtesy David Moore.
-
-    .. change:: 4031
-        :tags: bug, orm
-        :versions: 1.2.0b2
-        :tickets: 4031
-
-        Fixed bug involving JSON NULL evaluation logic added in 1.1 as part
-        of :ticket:`3514` where the logic would not accommodate ORM
-        mapped attributes named differently from the :class:`.Column`
-        that was mapped.
-
+    :include_notes_from: unreleased_11
 
 .. changelog::
     :version: 1.1.11

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 0814e709aeb264f4751b7d8d26067aa9d38eb96c..8c076a9bcd410a42caf96ae06af66f8fd294e6df 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,6 +12,7 @@
 
 .. changelog::
     :version: 1.2.0b2
+    :include_notes_from: unreleased_12
 
 .. changelog::
     :version: 1.2.0b1

diff --git a/doc/build/changelog/unreleased_11/4031.rst b/doc/build/changelog/unreleased_11/4031.rst
new file mode 100644 (file)
index 0000000..57aa455
--- /dev/null
+++ b/doc/build/changelog/unreleased_11/4031.rst
@@ -0,0 +1,9 @@
+.. change:: 4031
+    :tags: bug, orm
+    :versions: 1.2.0b2
+    :tickets: 4031
+
+    Fixed bug involving JSON NULL evaluation logic added in 1.1 as part
+    of :ticket:`3514` where the logic would not accommodate ORM
+    mapped attributes named differently from the :class:`.Column`
+    that was mapped.

diff --git a/doc/build/changelog/unreleased_11/4033.rst b/doc/build/changelog/unreleased_11/4033.rst
new file mode 100644 (file)
index 0000000..36854ad
--- /dev/null
+++ b/doc/build/changelog/unreleased_11/4033.rst
@@ -0,0 +1,10 @@
+.. change:: 4033
+    :tags: bug, orm
+    :tickets: 4033
+    :versions: 1.2.0b2
+
+    Fixed regression from 1.1.11 where adding additional non-entity
+    columns to a query that includes an entity with subqueryload
+    relationships would fail, due to an inspection added in 1.1.11 as a
+    result of :ticket:`4011`.
+

diff --git a/doc/build/changelog/unreleased_11/cache_order_sequence.rst b/doc/build/changelog/unreleased_11/cache_order_sequence.rst
new file mode 100644 (file)
index 0000000..2ba7146
--- /dev/null
+++ b/doc/build/changelog/unreleased_11/cache_order_sequence.rst
@@ -0,0 +1,10 @@
+.. change:: cache_order_sequence
+    :tags: feature, oracle, posgresql
+    :versions: 1.2.0b1
+
+    Added new keywords :paramref:`.Sequence.cache` and
+    :paramref:`.Sequence.order` to :class:`.Sequence`, to allow rendering
+    of the CACHE parameter understood by Oracle and PostgreSQL, and the
+    ORDER parameter understood by Oracle.  Pull request
+    courtesy David Moore.
+

diff --git a/doc/build/changelog/unreleased_12/4033.rst b/doc/build/changelog/unreleased_12/4033.rst
new file mode 100644 (file)
index 0000000..680ad2f
--- /dev/null
+++ b/doc/build/changelog/unreleased_12/4033.rst
@@ -0,0 +1,9 @@
+.. change:: 4033
+    :tags: bug, orm
+    :tickets: 4033
+
+    Fixed regression from 1.1.11 where adding additional non-entity
+    columns to a query that includes an entity with subqueryload
+    relationships would fail, due to an inspection added in 1.1.11 as a
+    result of :ticket:`4011`.
+

diff --git a/doc/build/conf.py b/doc/build/conf.py
index b50cfb8f8acd8a081e2b4313db5a20ed3edb0862..eadd07dfc04039831c08515fc6efa7d35c6fe788 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -27,7 +27,7 @@ import sqlalchemy
 # -- General configuration -----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+needs_sphinx = '1.6.0'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
@@ -70,6 +70,11 @@ changelog_render_pullreq = {
 
 changelog_render_changeset = "http://www.sqlalchemy.org/trac/changeset/%s"
 
+exclude_patterns = [
+    'build',
+    '**/unreleased*/*',
+]
+
 autodocmods_convert_modname = {
     "sqlalchemy.sql.sqltypes": "sqlalchemy.types",
     "sqlalchemy.sql.type_api": "sqlalchemy.types",
@@ -115,7 +120,7 @@ site_adapter_py = "docs_adapter.py"
 
 # arbitrary number recognized by builders.py, incrementing this
 # will force a rebuild
-build_number = 3
+build_number = "3"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -127,10 +132,6 @@ build_number = 3
 # Else, today_fmt is used as the format for a strftime call.
 #today_fmt = '%B %d, %Y'
 
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['build']
-
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
 

diff --git a/doc/build/requirements.txt b/doc/build/requirements.txt
index b7141c62a355002059b38efdd6f77f13826cf675..3836719d9f550e8fec5d2a4c7b534fd4d8e08e43 100644 (file)
--- a/doc/build/requirements.txt
+++ b/doc/build/requirements.txt
@@ -1,3 +1,3 @@
-changelog>=0.3.5
-sphinx-paramlinks>=0.3.3
+git+https://bitbucket.org/zzzeek/changelog.git@HEAD#egg=changelog
+git+https://bitbucket.org/zzzeek/sphinx-paramlinks.git@HEAD#egg=sphinx-paramlinks
 git+https://bitbucket.org/zzzeek/zzzeeksphinx.git@HEAD#egg=zzzeeksphinx