diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index b8edec02..c9848bcb 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -57,6 +57,13 @@ jobs: # os_dependencies = "git libxml2 libxslt" ## +## +# To test against a specific matrix of python versions +# when running tests jobs, add in .meta.toml: +# [github] +# py_versions = "['3.12', '3.11']" +## + ## # Specify additional jobs in .meta.toml: diff --git a/.meta.toml b/.meta.toml index 3b50967f..77440e5f 100644 --- a/.meta.toml +++ b/.meta.toml @@ -3,8 +3,11 @@ # See the inline comments on how to expand/tweak this configuration file [meta] template = "default" -commit-id = "123ebc0a" +commit-id = "a89af8f2" [pyproject] codespell_ignores = "complet,exemple" dependencies_ignores = "['Products.CMFPlone']" +dependencies_mappings = [ + "Pillow = ['PIL']", + ] diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f857b483..da56023f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ ci: repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.15.0 + rev: v3.15.2 hooks: - id: pyupgrade args: [--py38-plus] @@ -16,7 +16,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 24.1.1 + rev: 24.4.2 hooks: - id: black - repo: https://github.com/collective/zpretty @@ -44,7 +44,7 @@ repos: # """ ## - repo: https://github.com/codespell-project/codespell - rev: v2.2.6 + rev: v2.3.0 hooks: - id: codespell additional_dependencies: @@ -71,7 +71,7 @@ repos: - id: check-python-versions args: ['--only', 'setup.py,pyproject.toml'] - repo: https://github.com/collective/i18ndude - rev: "6.1.0" + rev: "6.2.0" hooks: - id: i18ndude diff --git a/news/127.bugfix b/news/127.bugfix new file mode 100644 index 00000000..4d34b45d --- /dev/null +++ b/news/127.bugfix @@ -0,0 +1,4 @@ +Remove unused and broken member-registration control panel. +This still tried to use the ``portal_properties`` tool. +Since Plone 5.0 the ``member-fields`` control panel is used instead. +[maurits] diff --git a/plone/app/users/browser/configure.zcml b/plone/app/users/browser/configure.zcml index c02cf3fa..3aa12036 100644 --- a/plone/app/users/browser/configure.zcml +++ b/plone/app/users/browser/configure.zcml @@ -11,13 +11,6 @@ file="permissions.zcml" /> - -