Merge pull request #131 from plone/maurits-fix-changelog-master

Fix changelog on master
plone · May 6, 2019 · b5544b8 · b5544b8
2 parents b73976f + cc0fd84
commit b5544b8
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 15 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,33 +8,45 @@ Changelog
 
 .. towncrier release notes start
 
-1.15.6 (2019-04-29)
+1.16.0 (2018-12-10)
 -------------------
 
 New features:
 
+- Included ``__repr__`` changes from 1.15.5 again.  This change is only good for Plone 5.2.
+  See also https://github.com/plone/Products.Archetypes/issues/130
+
+Bug fixes:
+
+- Fix packaging issues for Plone 5.2.
+  [esteele]
 
-- Move generateUniqueId script from CMFPlone here. 
-  It has no use outside Archetypes world. (#114)
-- Removed travis config. Jenkins is used instead. (#116)
 
+1.15.6 (2018-12-10)
+-------------------
 
 Bug fixes:
 
+- Reverted ``__repr__`` changes from 1.15.5.  That is only good for Plone 5.2.
+  The 1.16.0 release will contain that change.
+
 
-- Fix testlayer mess
+1.15.5 (2018-11-04)
+-------------------
+
+New features:
+
+- Move generateUniqueId script from CMFPlone here.
+  It has no use outside Archetypes world. (#114)
+- Removed travis config. Jenkins is used instead. (#116)
+
+Bug fixes:
 
-  [petschki] (#113)
+- Fix testlayer mess.  [petschki] (#113)
 - Use new utils.check_id from CMFPlone.  [maurits] (#118)
-- Problem: refactoring plone.app.widgets is not easy with too detailed expectations on the output of the pattern_options.
-  Its also outside the scope of this test.
-  Solution: check if there are pattern_options, but now what they are exactly.
-  [jensens] (#124)
-- Fixed slowness in ``unicodeTestIn`` script used by keyword template.
-  [maurits] (#125)
-- Add PathReprProvider as a baseclass of BaseContentMixin to restore the original __repr__ behavior instead of the new __repr__ from persistent.Persistent. See https://github.com/plone/Products.CMFPlone/issues/2590
+- Add ``PathReprProvider`` as a baseclass of ``BaseContentMixin`` to restore the original ``__repr__`` behavior instead of the new ``__repr__`` from ``persistent.Persistent``.
+  See `issue 2590 <https://github.com/plone/Products.CMFPlone/issues/2590>`_.
   [pbauer] (#212)
-- Fixed ``UnicodeEncodeError`` when editing Archetypes rich text.  [maurits] (#2832)
 
 
 1.15.4 (2018-09-30)

diff --git a/news/124.bugfix b/news/124.bugfix
@@ -0,0 +1,4 @@
+Problem: refactoring plone.app.widgets is not easy with too detailed expectations on the output of the pattern_options.
+Its also outside the scope of this test.
+Solution: check if there are pattern_options, but now what they are exactly.
+[jensens]
diff --git a/news/125.bugfix b/news/125.bugfix
@@ -0,0 +1,2 @@
+Fixed slowness in ``unicodeTestIn`` script used by keyword template.
+[maurits]
diff --git a/news/130.bugfix b/news/130.bugfix
@@ -0,0 +1 @@
+Fixed changelog for releases 1.15.5, 1.15.6 and 1.16.0.  [maurits]
diff --git a/news/2832.bugfix b/news/2832.bugfix
@@ -0,0 +1 @@
+Fixed ``UnicodeEncodeError`` when editing Archetypes rich text.  [maurits]
diff --git a/setup.py b/setup.py
@@ -11,7 +11,6 @@
                        open("CHANGES.rst").read(),
       classifiers=[
         "Framework :: Plone",
-        "Framework :: Plone :: 5.1",
         "Framework :: Plone :: 5.2",
         "Framework :: Zope2",
         "Framework :: Zope :: 4",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fixed slowness in ``unicodeTestIn`` script used by keyword template.
		[maurits]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed changelog for releases 1.15.5, 1.15.6 and 1.16.0. [maurits]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed ``UnicodeEncodeError`` when editing Archetypes rich text. [maurits]