Merge branch 'master' into icemac-patch-1

.editorconfig

@@ -1,4 +1,7 @@
-# EditorConfig Configurtaion file, for more details see:
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
+#
+# EditorConfig Configuration file, for more details see:
 # http://EditorConfig.org
 # EditorConfig is a convention description, that could be interpreted
 # by multiple editors to enforce common coding conventions for specific

.github/workflows/tests.yml

@@ -0,0 +1,54 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
+name: tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  schedule:
+    - cron: '0 12 * * 0'  # run once a week on Sunday
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        config:
+        # [Python version, tox env]
+        - ["3.8",   "lint"]
+        - ["3.6",   "py36"]
+        - ["3.7",   "py37"]
+        - ["3.8",   "py38"]
+        - ["3.9",   "py39"]
+        - ["3.8",   "docs"]
+        - ["3.8",   "coverage"]
+
+    runs-on: ubuntu-latest
+    name: ${{ matrix.config[1] }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.config[0] }}
+    - name: Pip cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ matrix.config[0] }}-${{ hashFiles('setup.*', 'tox.ini') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-${{ matrix.config[0] }}-
+          ${{ runner.os }}-pip-
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+    - name: Test
+      run: tox -e ${{ matrix.config[1] }}
+    - name: Coverage
+      if: matrix.config[1] == 'coverage'
+      run: |
+        pip install coveralls coverage-python-version
+        coveralls --service=github
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,35 +1,29 @@
-*.egg-info
-*.py?
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
+*.egg-info/
 *.profraw
-*.swp
-.Python
+*.pyc
+*.pyo
 .coverage
 .coverage.*
-.installed*.cfg
+.eggs/
+.installed.cfg
 .mr.developer.cfg
-.project
-.pydevproject
-.tox
-.vscode
-/bin/
-/build/
-/_build/
-/develop-eggs/
-/develop/
-/dist/
-/docs/.build/
-/docs/_build/
-/eggs/
-/etc/
-/htmlcov/
-/include/
-/lib/
-/lib64
-/log/
-/parts/
-/var/
+.tox/
+.vscode/
+__pycache__/
+bin/
+build/
 coverage.xml
-pip-selfcheck.json
-Pipfile
-Pipfile.lock
+develop-eggs/
+develop/
+dist/
+docs/_build
+eggs/
+etc/
+lib/
+lib64
+log/
+parts/
 pyvenv.cfg
+var/

.meta.toml

@@ -0,0 +1,136 @@
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
+[meta]
+template = "zope-product"
+commit-id = "211d612c86d6754ebe13fad9b7081533bb603ed9"
+
+[python]
+with-appveyor = true
+with-pypy = false
+with-legacy-python = false
+with-docs = true
+with-sphinx-doctests = false
+
+[coverage]
+fail-under = 80
+
+[isort]
+known_third_party = "ipaddress, PasteDeploy, waitress, chameleon, paste, pkg_resources"
+known_zope = "AccessControl, Acquisition, App, DateTime, DocumentTemplate, ExtensionClass, MultiMapping, OFS, Persistence, persistent, Products, RestrictedPython, Shared, Testing, transaction, webdav, ZConfig, zExceptions, zmi, ZODB, zope, Zope2, ZPublisher, ZTUtils"
+
+[flake8]
+additional-config = [
+    "# W503 line break before binary operator",
+    "ignore = W503",
+    ]
+
+[tox]
+additional-envlist = [
+    "pre-commit",
+    ]
+testenv-commands-pre = [
+    "{envbindir}/buildout -c {toxinidir}/buildout.cfg buildout:directory={envdir} buildout:develop={toxinidir} install alltests",
+    ]
+testenv-commands = [
+    "{envdir}/bin/alltests {posargs:-vc}",
+    ]
+coverage-command = "coverage run {envdir}/bin/alltests {posargs:-vc}"
+testenv-additional = [
+    "",
+    "[testenv:pre-commit]",
+    "basepython = python3",
+    "description = This env runs all linters configured in .pre-commit-config.yaml",
+    "skip_install = true",
+    "deps =",
+    "    pre-commit",
+    "commands_pre =",
+    "commands =",
+    "    pre-commit run --all-files --show-diff-on-failure",
+    "",
+    "[testenv:autopep8]",
+    "basepython = python3.6",
+    "skip_install = true",
+    "deps =",
+    "    -cconstraints.txt",
+    "    autopep8",
+    "    docformatter",
+    "commands =",
+    "    autopep8 --verbose --in-place --recursive --aggressive --aggressive {toxinidir}/src setup.py",
+    "    docformatter --in-place --recursive {toxinidir}/src setup.py",
+    ]
+
+[manifest]
+additional-rules = [
+    "include *.py",
+    "include *.yaml",
+    "include sources.cfg",
+    "include versions-prod.cfg",
+    "include versions.cfg",
+    "include zope-ecosystem.cfg",
+    "recursive-include docs *.css",
+    "recursive-include docs *.jpg",
+    "recursive-include docs *.png",
+    "recursive-include docs *.tgz",
+    "recursive-include src *.css",
+    "recursive-include src *.dtml",
+    "recursive-include src *.eot",
+    "recursive-include src *.gif",
+    "recursive-include src *.htm",
+    "recursive-include src *.html",
+    "recursive-include src *.ico",
+    "recursive-include src *.in",
+    "recursive-include src *.js",
+    "recursive-include src *.map",
+    "recursive-include src *.md",
+    "recursive-include src *.pdf",
+    "recursive-include src *.png",
+    "recursive-include src *.po",
+    "recursive-include src *.pot",
+    "recursive-include src *.svg",
+    "recursive-include src *.ttf",
+    "recursive-include src *.webmanifest",
+    "recursive-include src *.woff",
+    "recursive-include src *.woff2",
+    "recursive-include src *.xml",
+    "recursive-include src *.zpt",
+    ]
+
+[check-manifest]
+additional-ignores = [
+    "docs/_build/html/_images/*",
+    "docs/_build/html/_sources/migrations/*",
+    "docs/_build/html/_sources/migrations/zope4/*",
+    "docs/_build/html/_sources/zdgbook/*",
+    "docs/_build/html/_sources/zdgbook/includes/*",
+    "docs/_build/html/_sources/zopebook/*",
+    "docs/_build/html/_sources/zopebook/includes/*",
+    "docs/_build/html/_static/*",
+    "docs/_build/html/_static/css/*",
+    ]
+ignore-bad-ideas = [
+    "src/Products/Five/tests/locales/de/LC_MESSAGES/fivetest.mo",
+    "src/Products/Five/tests/locales/en/LC_MESSAGES/fivetest.mo",
+    ]
+
+[appveyor]
+replacement = [
+    "environment:",
+    "  matrix:",
+    "    - TOXENV: py38",
+    "    - TOXENV: py37",
+    "    - TOXENV: py36",
+    "    - TOXENV: py39",
+    "install:",
+    "  - python -m pip install -U pip",
+    "  - pip install -U setuptools wheel",
+    "  - pip install -U tox",
+    "build: false",
+    "matrix:",
+    "  fast_finish: true",
+    "  allow_failures:",
+    "    - TOXENV: py39",
+    "test_script:",
+    "  - tox",
+    "on_success:",
+    "  - echo Build succesful!",
+    ]

CHANGES.rst

@@ -8,10 +8,28 @@ The change log for the previous version, Zope 4, is at
 https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 
 
-5.1.1 (unreleased)
+5.1.2 (unreleased)
 ------------------
 
-- Revised debug info GUI
+- The ``compute_size`` method properly returns None if the content does not
+  have a ``get_size`` method but the parent has.
+  (`#948 <https://github.com/zopefoundation/Zope/issues/948>`_)
+
+- Fix control panel tab links on all control panel pages
+
+- Update to newest versions of dependencies.
+
+
+5.1.1 (2021-02-10)
+------------------
+
+- Replace (in ``OFS``) the deprecated direct ``id`` access by
+  ``getId`` calls.
+  (`#903 <https://github.com/zopefoundation/Zope/issues/903>`_)
+
+- Update ZMI dependencies for Font Awesome, jQuery and bootstrap.
+
+- Revise debug info GUI
   (`#937 <https://github.com/zopefoundation/Zope/pull/937>`_)
 
 - Convert ``bytes`` ``HTTPResponse`` header value to ``str``

MANIFEST.in

@@ -1,32 +1,32 @@
-include *.py
+# Generated from:
+# https://github.com/zopefoundation/meta/tree/master/config/zope-product
 include *.rst
 include *.txt
 include buildout.cfg
+include tox.ini
+include appveyor.yml
+
+recursive-include docs *.bat
+recursive-include docs *.py
+recursive-include docs *.rst
+recursive-include docs *.txt
+recursive-include docs Makefile
+
+recursive-include src *.pt
+recursive-include src *.py
+recursive-include src *.rst
+recursive-include src *.txt
+recursive-include src *.zcml
+include *.py
+include *.yaml
 include sources.cfg
 include versions-prod.cfg
 include versions.cfg
 include zope-ecosystem.cfg
-
-include *.yml
-exclude *.yml
-
-include .editorconfig
-exclude .editorconfig
-
-include .gitignore
-exclude .gitignore
-
-exclude MANIFEST.in
-
-recursive-include docs *.bat
 recursive-include docs *.css
 recursive-include docs *.jpg
 recursive-include docs *.png
-recursive-include docs *.py
-recursive-include docs *.rst
 recursive-include docs *.tgz
-recursive-include docs *.txt
-recursive-include docs Makefile
 recursive-include src *.css
 recursive-include src *.dtml
 recursive-include src *.eot
@@ -38,20 +38,14 @@ recursive-include src *.in
 recursive-include src *.js
 recursive-include src *.map
 recursive-include src *.md
-recursive-include src *.mo
 recursive-include src *.pdf
 recursive-include src *.png
 recursive-include src *.po
 recursive-include src *.pot
-recursive-include src *.pt
-recursive-include src *.py
-recursive-include src *.rst
 recursive-include src *.svg
 recursive-include src *.ttf
-recursive-include src *.txt
 recursive-include src *.webmanifest
 recursive-include src *.woff
 recursive-include src *.woff2
 recursive-include src *.xml
-recursive-include src *.zcml
 recursive-include src *.zpt