diff --git a/last_commit.txt b/last_commit.txt index c0ad2ff10c..70be03d5ab 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,48 +1,91 @@ -Repository: plone.app.vocabularies +Repository: plone.app.event Branch: refs/heads/master -Date: 2023-09-15T12:25:09+02:00 -Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/plone.app.vocabularies/commit/8b2f4f70c45cf589668e0a827303ac9d4c682161 +Date: 2023-09-07T15:13:55+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.app.event/commit/86c775628ece5bedb0824402de8d1c6a2feec527 -translate column-heading title in listing_tabular +Require setuptools 68.2 or higher for building the package. + +When built with setuptools 68.1, you could not import the package, at least not an editable package. +Note that you can still *install* this package with older setuptools versions. +See [Plone meta issue 172](https://github.com/plone/meta/issues/172) for details. + +New problem though. `tox -e dependencies` says: + +``` +ERROR Missing dependencies: + setuptools>=68.2 +``` + +I tried with `setuptools<68.1', which would also work, but that only changes the message: + +``` +ERROR Missing dependencies: + setuptools<68.1 +``` + +I think this is a shortcoming in `z3c.dependencychecker`. It should not report this as a missing dependency. +It should see that `pyproject.toml` has this dependency covered. + +We definitely should *not* require `setuptools>=68.2` in `install_requires`. + +Files changed: +A news/172.internal +M pyproject.toml + +b'diff --git a/news/172.internal b/news/172.internal\nnew file mode 100644\nindex 000000000..6a54c5491\n--- /dev/null\n+++ b/news/172.internal\n@@ -0,0 +1,5 @@\n+Require setuptools 68.2 or higher for building the package.\n+When built with setuptools 68.1, you could not import the package, at least not an editable package.\n+Note that you can still *install* this package with older setuptools versions.\n+See `Plone meta issue 172 `_ for details.\n+[maurits]\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 4f15ca58f..fd2ab3e2c 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -1,6 +1,9 @@\n # Generated from:\n # https://github.com/plone/meta/tree/master/config/default\n # See the inline comments on how to expand/tweak this configuration file\n+[build-system]\n+requires = ["setuptools>=68.2", "wheel"]\n+\n [tool.towncrier]\n directory = "news/"\n filename = "CHANGES.rst"\n' + +Repository: plone.app.event + + +Branch: refs/heads/master +Date: 2023-09-07T15:47:33+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.app.event/commit/ce6b5c3c9d9180d966f96c57a724385730c4f1d0 + +tox -e dependencies: we do want isolation when building the package. + +Otherwise the build command fails. +See https://github.com/reinout/z3c.dependencychecker/issues/124 Files changed: -M plone/app/vocabularies/metadatafields.py +M tox.ini -b'diff --git a/plone/app/vocabularies/metadatafields.py b/plone/app/vocabularies/metadatafields.py\nindex 2ef09d3..16d157d 100644\n--- a/plone/app/vocabularies/metadatafields.py\n+++ b/plone/app/vocabularies/metadatafields.py\n@@ -26,6 +26,7 @@\n "Type": _("Type"),\n "total_comments": _("Total comments"),\n "mime_type": _("MIME type"),\n+ "Title": _("Title"),\n }\n \n \n' +b'diff --git a/tox.ini b/tox.ini\nindex 60d323c7..16c4de19 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -58,7 +58,7 @@ deps =\n build\n z3c.dependencychecker==2.11\n commands =\n- python -m build --sdist --no-isolation\n+ python -m build --sdist\n dependencychecker\n \n [testenv:dependencies-graph]\n' -Repository: plone.app.vocabularies +Repository: plone.app.event Branch: refs/heads/master -Date: 2023-09-15T12:27:40+02:00 -Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/plone.app.vocabularies/commit/f9f7b90395c1e47424c1f6622f1577217537ba7d +Date: 2023-09-07T15:53:11+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.app.event/commit/ff5c13e759da554c607d6833ad447b25d0018620 -add changenote +tox: need to build with isolation in check-release env as well. Files changed: -A news/82.bugfix +M tox.ini -b'diff --git a/news/82.bugfix b/news/82.bugfix\nnew file mode 100644\nindex 0000000..8db1ab9\n--- /dev/null\n+++ b/news/82.bugfix\n@@ -0,0 +1,2 @@\n+Fix the untranslated table-column-heading "Title" in listing_tabular for collections and folders.\n+[pbauer]\n' +b'diff --git a/tox.ini b/tox.ini\nindex 16c4de19..3f82c641 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -125,7 +125,7 @@ commands =\n # we build the change log as news entries might break\n # the README that is displayed on PyPI\n towncrier build --version=100.0.0 --yes\n- python -m build --sdist --no-isolation\n+ python -m build --sdist\n twine check dist/*\n \n [testenv:circular]\n' -Repository: plone.app.vocabularies +Repository: plone.app.event Branch: refs/heads/master -Date: 2023-09-15T07:58:46-07:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.app.vocabularies/commit/dd798108acd0d5fc8556fa429897d74af5e231b5 +Date: 2023-09-16T12:13:25+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.app.event/commit/e040c0e3ea7f7a1458000fb15d5188f9dfb0f9bf -Merge pull request #82 from plone/translate_title +Merge pull request #385 from plone/maurits-minimum-setuptools-version-for-build -Translate column-heading title in listing_tabular +Require setuptools 68.2 or higher for building the package. Files changed: -A news/82.bugfix -M plone/app/vocabularies/metadatafields.py +A news/172.internal +M pyproject.toml +M tox.ini -b'diff --git a/news/82.bugfix b/news/82.bugfix\nnew file mode 100644\nindex 0000000..8db1ab9\n--- /dev/null\n+++ b/news/82.bugfix\n@@ -0,0 +1,2 @@\n+Fix the untranslated table-column-heading "Title" in listing_tabular for collections and folders.\n+[pbauer]\ndiff --git a/plone/app/vocabularies/metadatafields.py b/plone/app/vocabularies/metadatafields.py\nindex 2ef09d3..16d157d 100644\n--- a/plone/app/vocabularies/metadatafields.py\n+++ b/plone/app/vocabularies/metadatafields.py\n@@ -26,6 +26,7 @@\n "Type": _("Type"),\n "total_comments": _("Total comments"),\n "mime_type": _("MIME type"),\n+ "Title": _("Title"),\n }\n \n \n' +b'diff --git a/news/172.internal b/news/172.internal\nnew file mode 100644\nindex 000000000..6a54c5491\n--- /dev/null\n+++ b/news/172.internal\n@@ -0,0 +1,5 @@\n+Require setuptools 68.2 or higher for building the package.\n+When built with setuptools 68.1, you could not import the package, at least not an editable package.\n+Note that you can still *install* this package with older setuptools versions.\n+See `Plone meta issue 172 `_ for details.\n+[maurits]\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 4f15ca58f..fd2ab3e2c 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -1,6 +1,9 @@\n # Generated from:\n # https://github.com/plone/meta/tree/master/config/default\n # See the inline comments on how to expand/tweak this configuration file\n+[build-system]\n+requires = ["setuptools>=68.2", "wheel"]\n+\n [tool.towncrier]\n directory = "news/"\n filename = "CHANGES.rst"\ndiff --git a/tox.ini b/tox.ini\nindex 60d323c79..3f82c641a 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -58,7 +58,7 @@ deps =\n build\n z3c.dependencychecker==2.11\n commands =\n- python -m build --sdist --no-isolation\n+ python -m build --sdist\n dependencychecker\n \n [testenv:dependencies-graph]\n@@ -125,7 +125,7 @@ commands =\n # we build the change log as news entries might break\n # the README that is displayed on PyPI\n towncrier build --version=100.0.0 --yes\n- python -m build --sdist --no-isolation\n+ python -m build --sdist\n twine check dist/*\n \n [testenv:circular]\n'