From e245ed72b12b851232e448f2c8d423b488227d08 Mon Sep 17 00:00:00 2001 From: mauritsvanrees Date: Tue, 10 Dec 2024 12:23:34 +0100 Subject: [PATCH] [fc] Repository: plone.base Branch: refs/heads/1.x Date: 2024-12-06T23:15:59+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.base/commit/fcd4d3327c99589c56fa1624f1714889a6c7c6c1 Fixed tests when using Zope 5.11. In one test we got a `mappingproxy` instead of a dictionary: ``` File "...plone.base-2.0.1-py3.10.egg/plone/base/tests/messages.rst", line 39, in messages.rst Failed example: msg.mapping Expected: {'name': 'Plone'} Got: mappingproxy({'name': 'Plone'}) ``` Files changed: A news/956.tests M src/plone/base/tests/messages.rst Repository: plone.base Branch: refs/heads/1.x Date: 2024-12-10T12:23:34+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.base/commit/52285cf96e94519b1e8912dcaa3f3ae7f4826edb Merge pull request #74 from plone/maurits-mappingproxy-1x Fixed tests when using Zope 5.11. [1.x, second try] Files changed: A news/956.tests M src/plone/base/tests/messages.rst --- last_commit.txt | 67 +++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 7e2c668548..4d1ff33c4f 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,55 +1,46 @@ -Repository: plone.api +Repository: plone.base -Branch: refs/heads/master -Date: 2024-12-06T22:46:21-08:00 -Author: Steve Piercy (stevepiercy) -Commit: https://github.com/plone/plone.api/commit/5c7e0feaed0e5c8537953985e7aabe0b542b5efc +Branch: refs/heads/1.x +Date: 2024-12-06T23:15:59+01:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.base/commit/fcd4d3327c99589c56fa1624f1714889a6c7c6c1 -Remove references to non-functional Coveralls +Fixed tests when using Zope 5.11. -Coveralls has not worked since Travis CI was removed back in 2021(?). Documentation still shows it is being used. It hasn't been missed. +In one test we got a `mappingproxy` instead of a dictionary: -- Closes #537 -- See #233, which I think should be closed. +``` +File "...plone.base-2.0.1-py3.10.egg/plone/base/tests/messages.rst", line 39, in messages.rst +Failed example: + msg.mapping +Expected: + {'name': 'Plone'} +Got: + mappingproxy({'name': 'Plone'}) +``` Files changed: -M README.md -M docs/contribute.md +A news/956.tests +M src/plone/base/tests/messages.rst -b'diff --git a/README.md b/README.md\nindex 481eec7e..1bf7c5bc 100644\n--- a/README.md\n+++ b/README.md\n@@ -40,6 +40,3 @@ Issues\n Continuous Integration\n tested on [GitHub Actions](https://github.com/plone/plone.api/actions).\n \n-Code Coverage\n- is measured at [Coveralls.io](https://coveralls.io/github/plone/plone.api).\n-\ndiff --git a/docs/contribute.md b/docs/contribute.md\nindex 4df6de3a..ebacea56 100644\n--- a/docs/contribute.md\n+++ b/docs/contribute.md\n@@ -241,4 +241,3 @@ The documentation is rendered with a link from the API reference to the narrativ\n - {doc}`plone:index`\n - [Source code](https://github.com/plone/plone.api)\n - [Issue tracker](https://github.com/plone/plone.api/issues)\n-- [Code Coverage](https://coveralls.io/github/plone/plone.api)\n' +b"diff --git a/news/956.tests b/news/956.tests\nnew file mode 100644\nindex 0000000..fc57308\n--- /dev/null\n+++ b/news/956.tests\n@@ -0,0 +1,3 @@\n+Fixed tests when using Zope 5.11.\n+In one test we got a `mappingproxy` instead of a dictionary.\n+[maurits]\ndiff --git a/src/plone/base/tests/messages.rst b/src/plone/base/tests/messages.rst\nindex 2187c65..f6ec452 100644\n--- a/src/plone/base/tests/messages.rst\n+++ b/src/plone/base/tests/messages.rst\n@@ -36,7 +36,7 @@ And at last there is the possibility of variable substitution:\n >>> msg.default\n 'Hello ${name}'\n \n- >>> msg.mapping\n+ >>> dict(msg.mapping)\n {'name': 'Plone'}\n \n Messages with translation service set up\n" -Repository: plone.api +Repository: plone.base -Branch: refs/heads/master -Date: 2024-12-06T22:48:12-08:00 -Author: Steve Piercy (stevepiercy) -Commit: https://github.com/plone/plone.api/commit/86ae02909232d9d366cb4e13db4515525fef487a +Branch: refs/heads/1.x +Date: 2024-12-10T12:23:34+01:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.base/commit/52285cf96e94519b1e8912dcaa3f3ae7f4826edb -news +Merge pull request #74 from plone/maurits-mappingproxy-1x -Files changed: -A news/543.documentation - -b'diff --git a/news/543.documentation b/news/543.documentation\nnew file mode 100644\nindex 00000000..74efef8b\n--- /dev/null\n+++ b/news/543.documentation\n@@ -0,0 +1 @@\n+Remove references to unused Coveralls. @stevepiercy\n' - -Repository: plone.api - - -Branch: refs/heads/master -Date: 2024-12-09T13:59:52-08:00 -Author: Steve Piercy (stevepiercy) -Commit: https://github.com/plone/plone.api/commit/a6145e06a8a6d4c7fd68f0b87ddea68213d4a979 - -Merge pull request #543 from plone/remove-unused-coveralls - -Remove references to non-functional Coveralls +Fixed tests when using Zope 5.11. [1.x, second try] Files changed: -A news/543.documentation -M README.md -M docs/contribute.md +A news/956.tests +M src/plone/base/tests/messages.rst -b'diff --git a/README.md b/README.md\nindex 481eec7e..1bf7c5bc 100644\n--- a/README.md\n+++ b/README.md\n@@ -40,6 +40,3 @@ Issues\n Continuous Integration\n tested on [GitHub Actions](https://github.com/plone/plone.api/actions).\n \n-Code Coverage\n- is measured at [Coveralls.io](https://coveralls.io/github/plone/plone.api).\n-\ndiff --git a/docs/contribute.md b/docs/contribute.md\nindex 4df6de3a..ebacea56 100644\n--- a/docs/contribute.md\n+++ b/docs/contribute.md\n@@ -241,4 +241,3 @@ The documentation is rendered with a link from the API reference to the narrativ\n - {doc}`plone:index`\n - [Source code](https://github.com/plone/plone.api)\n - [Issue tracker](https://github.com/plone/plone.api/issues)\n-- [Code Coverage](https://coveralls.io/github/plone/plone.api)\ndiff --git a/news/543.documentation b/news/543.documentation\nnew file mode 100644\nindex 00000000..74efef8b\n--- /dev/null\n+++ b/news/543.documentation\n@@ -0,0 +1 @@\n+Remove references to unused Coveralls. @stevepiercy\n' +b"diff --git a/news/956.tests b/news/956.tests\nnew file mode 100644\nindex 0000000..fc57308\n--- /dev/null\n+++ b/news/956.tests\n@@ -0,0 +1,3 @@\n+Fixed tests when using Zope 5.11.\n+In one test we got a `mappingproxy` instead of a dictionary.\n+[maurits]\ndiff --git a/src/plone/base/tests/messages.rst b/src/plone/base/tests/messages.rst\nindex 2187c65..f6ec452 100644\n--- a/src/plone/base/tests/messages.rst\n+++ b/src/plone/base/tests/messages.rst\n@@ -36,7 +36,7 @@ And at last there is the possibility of variable substitution:\n >>> msg.default\n 'Hello ${name}'\n \n- >>> msg.mapping\n+ >>> dict(msg.mapping)\n {'name': 'Plone'}\n \n Messages with translation service set up\n"