summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2024-02-07 21:08:16 -0700
committerMichael Merickel <michael@merickel.org>2024-02-07 21:08:16 -0700
commit0441e47ae10f8e2006fd56860c90e96de30f6dec (patch)
treea68310f52429bddb38bb87b6c16550980f730782
parent03e2e439f263aca7d4efa8173c0bbc4aacb8a3c2 (diff)
downloadpyramid-0441e47ae10f8e2006fd56860c90e96de30f6dec.tar.gz
pyramid-0441e47ae10f8e2006fd56860c90e96de30f6dec.tar.bz2
pyramid-0441e47ae10f8e2006fd56860c90e96de30f6dec.zip
add changelog for #3747 and #3751
-rw-r--r--CHANGES.rst12
-rw-r--r--docs/tutorials/wiki2/src/authentication/MANIFEST.in2
-rw-r--r--docs/tutorials/wiki2/src/authorization/MANIFEST.in2
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/MANIFEST.in2
-rw-r--r--docs/tutorials/wiki2/src/installation/MANIFEST.in2
-rw-r--r--docs/tutorials/wiki2/src/models/MANIFEST.in2
-rw-r--r--docs/tutorials/wiki2/src/tests/MANIFEST.in2
7 files changed, 18 insertions, 6 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 96d496044..e712449ca 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -63,3 +63,15 @@ Backward Incompatibilities
Documentation Changes
---------------------
+
+- Sync the SQLAlchemy Wiki tutorial with changes to the
+ ``pyramid-cookiecutter-starter``. Includes updates to use ``pyproject.toml``
+ to replace separate config files for ``pytest``, ``coverage``, and
+ ``setuptools``. Also upgrades patterns to support SQLAlchemy 2.0.
+ See https://github.com/Pylons/pyramid/pull/3747
+
+- Sync the ZODB Wiki tutorial with changes to the
+ ``pyramid-cookiecutter-starter``. Includes updates to use ``pyproject.toml``
+ to replace separate config files for ``pytest``, ``coverage``, and
+ ``setuptools``.
+ See https://github.com/Pylons/pyramid/pull/3751
diff --git a/docs/tutorials/wiki2/src/authentication/MANIFEST.in b/docs/tutorials/wiki2/src/authentication/MANIFEST.in
index 201692c1b..131373dc0 100644
--- a/docs/tutorials/wiki2/src/authentication/MANIFEST.in
+++ b/docs/tutorials/wiki2/src/authentication/MANIFEST.in
@@ -1,4 +1,4 @@
-include *.txt *.ini *.cfg *.rst *.toml
+include *.txt *.ini *.cfg *.md *.toml
recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
recursive-include tests *
recursive-exclude * __pycache__
diff --git a/docs/tutorials/wiki2/src/authorization/MANIFEST.in b/docs/tutorials/wiki2/src/authorization/MANIFEST.in
index 201692c1b..131373dc0 100644
--- a/docs/tutorials/wiki2/src/authorization/MANIFEST.in
+++ b/docs/tutorials/wiki2/src/authorization/MANIFEST.in
@@ -1,4 +1,4 @@
-include *.txt *.ini *.cfg *.rst *.toml
+include *.txt *.ini *.cfg *.md *.toml
recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
recursive-include tests *
recursive-exclude * __pycache__
diff --git a/docs/tutorials/wiki2/src/basiclayout/MANIFEST.in b/docs/tutorials/wiki2/src/basiclayout/MANIFEST.in
index 201692c1b..131373dc0 100644
--- a/docs/tutorials/wiki2/src/basiclayout/MANIFEST.in
+++ b/docs/tutorials/wiki2/src/basiclayout/MANIFEST.in
@@ -1,4 +1,4 @@
-include *.txt *.ini *.cfg *.rst *.toml
+include *.txt *.ini *.cfg *.md *.toml
recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
recursive-include tests *
recursive-exclude * __pycache__
diff --git a/docs/tutorials/wiki2/src/installation/MANIFEST.in b/docs/tutorials/wiki2/src/installation/MANIFEST.in
index 201692c1b..131373dc0 100644
--- a/docs/tutorials/wiki2/src/installation/MANIFEST.in
+++ b/docs/tutorials/wiki2/src/installation/MANIFEST.in
@@ -1,4 +1,4 @@
-include *.txt *.ini *.cfg *.rst *.toml
+include *.txt *.ini *.cfg *.md *.toml
recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
recursive-include tests *
recursive-exclude * __pycache__
diff --git a/docs/tutorials/wiki2/src/models/MANIFEST.in b/docs/tutorials/wiki2/src/models/MANIFEST.in
index 201692c1b..131373dc0 100644
--- a/docs/tutorials/wiki2/src/models/MANIFEST.in
+++ b/docs/tutorials/wiki2/src/models/MANIFEST.in
@@ -1,4 +1,4 @@
-include *.txt *.ini *.cfg *.rst *.toml
+include *.txt *.ini *.cfg *.md *.toml
recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
recursive-include tests *
recursive-exclude * __pycache__
diff --git a/docs/tutorials/wiki2/src/tests/MANIFEST.in b/docs/tutorials/wiki2/src/tests/MANIFEST.in
index 201692c1b..131373dc0 100644
--- a/docs/tutorials/wiki2/src/tests/MANIFEST.in
+++ b/docs/tutorials/wiki2/src/tests/MANIFEST.in
@@ -1,4 +1,4 @@
-include *.txt *.ini *.cfg *.rst *.toml
+include *.txt *.ini *.cfg *.md *.toml
recursive-include tutorial *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
recursive-include tests *
recursive-exclude * __pycache__