Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Register
  • Sign in
  • erp5 erp5
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Merge requests 142
    • Merge requests 142
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • nexedinexedi
  • erp5erp5
  • Merge requests
  • !1735

WIP: Support both Zope2 and Zope4

  • Review changes

  • Download
  • Patches
  • Plain diff
Closed Kazuhiko Shiozaki requested to merge zope2zope4py2 into zope4py2 Feb 08, 2023
  • Overview 20
  • Commits 13
  • Pipelines 6
  • Changes 30

I introduce small changes to support both Zope2 and Zope4 in the same branch, so that those who don't upgrade to Zope4 in near future can still keep contributing.

Also, it may make project code upgrade safer, like you upgrade to the latest code on Zope2 first, then upgrade to Zope4.

Here are changes to the current master (normal Zope2 branch) :

  • remove patch code of DTMLMethod and PythonScript ZMI (see e7c01c2e)
  • remove mostly-copy-and-pasted code of publish() in ERP5TypeTestCase (see 4593328a)
  • remove ZServer support (see e702bb69)
Edited Feb 15, 2023 by Kazuhiko Shiozaki
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: zope2zope4py2
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7