Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
erp5
erp5
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 112
    • Merge Requests 112
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • erp5erp5
  • Merge Requests
  • !957

Open
Opened Oct 11, 2019 by Bryton Lacquement@bminusl🚪
  • Report abuse
Report abuse

WIP: Add support for CMF 2.3

This is part of the work to update ERP5 and its dependencies to support Python 3.

We incrementally update CMF to versions:

  • 2.3 (this MR), the last version compatible with Zope 2.13.x
  • 2.4+ (in the future), only compatible with Zope 4

We also drop Products.CMFDefault and Products.CMFUid, at the same time. These products are not compatible with Python 3.

Edited Jan 25, 2021 by Julien Muchembled

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b cmf_upgrade_versions origin/cmf_upgrade_versions

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff cmf_upgrade_versions

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 28
  • Commits 31
  • Changes 30
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!957
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号