Merge branch 'master' into filippo_moderation_js

CHANGES.rst

@@ -27,7 +27,7 @@ Bug fixes:
   [iham]
 
 - Fix commenting and tests in python 3.
-  [pbauer]
+  [pbauer, jensens]
 
 3.0.6 (2018-06-18)
 ------------------

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]

setup.py

@@ -47,9 +47,9 @@ 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']),
+      packages=find_packages(),
       namespace_packages=['plone', 'plone.app'],
       include_package_data=True,
       zip_safe=False,