Development

Development Workflow

...

Upstreaming Changes

...

Updating Minor Versions

Here the repository is configured so that

• origin: https://github.com/msys2-contrib/cpython-mingw
• upstream: https://github.com/python/cpython
• fork: https://github.com/naveen521kk/cpython

1. Fetch the tag from the upstream and create a new branch from it and push.

git fetch upstream v<version-number>
git checkout -b wip-mingw-v<version-number> v<version-number>
git checkout -b mingw-v<version-number> v<version-number>
git push origin wip-mingw-v<version-number>
git push origin mingw-v<version-number>

2. Switch to wip branch and cherry-pick all the previous commits from old branch

git cherry-pick v<old-version-number>..mingw-v<old-version-number>

3. Try to clean up the history, merge patches etc to make the history clean and linear (makes future updates easier)
4. Create a new PR for merging wip-mingw-v<version-number> into mingw-v<version-number>
5. Include a range-diff in the PR description: git range-diff v<old-version-number>..mingw-v<old-version-number> mingw-v<new-version-number>..wip-mingw-v<new-version-number>.
6. Merge the PR
7. Make the new branch mingw-v<new-version-number> the default branch
8. Update the patches in MINGW-packages repo

Tips

• If rebuilds with make lead to a segfault, rm pybuilddir.txt and try again