From 6cf6bf25f2d2e87eac7185db4623542d02a5d478 Mon Sep 17 00:00:00 2001 From: "Jens W. Klein" Date: Fri, 28 Sep 2018 14:22:51 +0200 Subject: [PATCH 1/3] fix test in py3 --- CHANGES.rst | 2 +- plone/app/discussion/tests/test_catalog.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 74f80da..92c6b58 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -23,7 +23,7 @@ Bug fixes: [iham] - Fix commenting and tests in python 3. - [pbauer] + [pbauer, jensens] 3.0.6 (2018-06-18) ------------------ diff --git a/plone/app/discussion/tests/test_catalog.py b/plone/app/discussion/tests/test_catalog.py index 1b37d77..8856866 100644 --- a/plone/app/discussion/tests/test_catalog.py +++ b/plone/app/discussion/tests/test_catalog.py @@ -204,7 +204,10 @@ class ConversationCatalogTest(unittest.TestCase): ) doc1_brain = brains[0] - self.assertEqual(doc1_brain.commentators, ('Jim', 'Emma')) + self.assertEqual( + sorted(doc1_brain.commentators), + sorted(('Jim', 'Emma')), + ) # remove one comments del self.conversation[new_comment2_id] From 1fdeb667dc8990a3a37cdfacaea4d034639f99b2 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Mon, 1 Oct 2018 15:34:06 +0200 Subject: [PATCH 2/3] Fixed PyPI links in setup.py. [ci skip] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4544405..17d0cec 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ setup(name='plone.app.discussion', keywords='plone discussion', author='Timo Stollenwerk - Plone Foundation', author_email='plone-developers@lists.sourceforge.net', - url='https://pypi.python.org/pypi/plone.app.discussion', + url='https://pypi.org/project/plone.app.discussion', license='GPL', packages=find_packages(exclude=['ez_setup']), namespace_packages=['plone', 'plone.app'], From 069b0c4b9406bdc0d8527383f03af1ea7a2f26d6 Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Mon, 1 Oct 2018 17:55:09 +0200 Subject: [PATCH 3/3] Removed unneeded exclude ez_setup.py from setup.py. [ci skip] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 17d0cec..a30fec0 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ setup(name='plone.app.discussion', author_email='plone-developers@lists.sourceforge.net', url='https://pypi.org/project/plone.app.discussion', license='GPL', - packages=find_packages(exclude=['ez_setup']), + packages=find_packages(), namespace_packages=['plone', 'plone.app'], include_package_data=True, zip_safe=False,