Re: [Zope-CMF] A Tale of Two Repositories
Tres Seaver schreef op 26-05-15 om 03:10: I have cloned the root CMF buildout repository to Git, and pushed to Github[1] and Launchpad[2]. This one was involved enough that I'd like some extra eyeballs on it before clearing out the SVN 'trunk': in particular, I think it is possilbe that some of the historical changes (removing the products as direct contents, replacing them first with 'svn:externals', an later with 'mr.developer' checkouts), could be messed up. If you have the zen, please clone from either Git location and poke around. I tried to preserve important tags (those matching releases) and branches (the release lines) but left some of them behind. Please check for correct e-mail addresses in the logs, too. Note that the only current CI build is failing even though it is checked out still from SVN[3]. I haven't looked into it yet, but the likelihood is that it will be a relatively shallow fix. [1] https://github.com/zopefoundation/CMF-buildout [2] https://code.launchpad.net/zope-cmf-buildout [3] https://jenkins.starzel.de/job/CMF-trunk_Zope-trunk/750/ Tres. Thanks! Looks okay to me. I did a few more commits, adding .gitignore to all products and buildouts, updating buildout configs for the 2.2 and 2.3 branch, fixing the failing CMFCore test. -- Maurits van Rees: http://maurits.vanrees.org/ Zest Software: http://zestsoftware.nl ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
I have cloned the root CMF buildout repository to Git, and pushed to Github[1] and Launchpad[2]. This one was involved enough that I'd like some extra eyeballs on it before clearing out the SVN 'trunk': in particular, I think it is possilbe that some of the historical changes (removing the products as direct contents, replacing them first with 'svn:externals', an later with 'mr.developer' checkouts), could be messed up. If you have the zen, please clone from either Git location and poke around. I tried to preserve important tags (those matching releases) and branches (the release lines) but left some of them behind. Please check for correct e-mail addresses in the logs, too. Note that the only current CI build is failing even though it is checked out still from SVN[3]. I haven't looked into it yet, but the likelihood is that it will be a relatively shallow fix. [1] https://github.com/zopefoundation/CMF-buildout [2] https://code.launchpad.net/zope-cmf-buildout [3] https://jenkins.starzel.de/job/CMF-trunk_Zope-trunk/750/ Tres. -- === Tres Seaver +1 540-429-0999 tsea...@palladion.com Palladion Software Excellence by Designhttp://palladion.com ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
On 05/14/2015 03:14 PM, Tres Seaver wrote: Proposed Github-Launchpad Workflow for CMF == A Tale of Two Repositories -- .. blockquote:: It was the best of times, it was the worst of times, it was the age of wisdom, it was the age of foolishness, it was the epoch of belief, it was the epoch of incredulity, it was the season of Light, it was the season of Darkness, it was the spring of hope, it was the winter of despair, we had everything before us, we had nothing before us, we were all going direct to Heaven, we were all going direct the other way – in short, the period was so far like the present period, that some of its noisiest authorities insisted on its being received, for good or for evil, in the superlative degree of comparison only. At present, the various CMF projects (``Products.CMFCore``, ``Products.CMFDefault``, ``Products.CMFCalendar``, ``Products.CMFTopic``, ``Products.CMFUID``, ``Products.GenericSetup``) are the only Zope Foundation projects actively maintained on ``svn.zope.org``: all others have migrated to Github. In the case that any other previously-languishing project becomes active, it is first moved to Github (e.g., [1]). The CMF projects are in this state because one of the main developers is unwilling to participate in the project if it moves entirely to Github[2], but is willing to continue if a proposal is in place to maintain a second public repository, against which his contributions would be made[3]. This proposal aims to satisfy that request by hosting the second, synchronized repository for each project using the new Launchpad Git hosting option[4]. Repository Details -- For each of the projects listed above: 1) Create a Git repository from its Subversion history, and push that repository to Github; this step will use the same scripts used for other ZF repositories. E.g., the branches, tags, and trunk for ``Products.CMFCore`` will be hosted on Github at https://github.com/zopefoundation/Products.CMFCore 2) Push the new Git repository also to Launchpad. E.g., the same repository will be pushed to https://code.launchpad.net/~zope-cmf/Products.CMFCore 3) Remove all entries from the project's trunk and active release branches on ``svn.zope.org``, leaving behind only a 4) Add one-way synchronization (mirroring) from the Github repository to the Launchpad repository, with the synch happening on a ZF-maintained host. This explicit syncronization can be retired once the Launchpad Git integration has added its own mirroring (already announced as underway on [4]). Contributor Workflow: Github - Github-based contributors will follow normal Github workflow patterns: - Fork the repository of interest via the Github UI. - Check out the fork, e.g.: .. code-block:: bash $ git clone g...@github.com:username/Products.CMFCore $ cd Products.CMFCore - Make their changes on a branch, test them, and commit. .. code-block:: bash $ git checkout -b bug-12345 master $ vim Products/CMFCore/DynamicType.py ... $ tox ... $ git commit -am Clean up dyanmic types. Fixes #12345 - Push the changed branch back to their fork on Github: .. code-block:: bash $ git push origin bug-12345 - Create a pull request from the branch of their fork to the appropriate master / release branch of ZF's repository via the Github UI. Contributor Workflow: Launchpad Launchpad-based contributors will follow normal Launchpad workflow patterns. (URLs below assume the contributor has applied the Git configuration described in the Configuring Git section of [4]). - Clone the repository, e.g.: .. code-block:: bash $ git clone lp:Products.CMFCore $ cd Products.CMFCore - Make their changes on a branch, test them, and commit. .. code-block:: bash $ git checkout -b bug-12345 master $ vim Products/CMFCore/DynamicType.py ... $ tox ... $ git commit -am Clean up dyanmic types. Fixes #12345 - Push the changed branch back to their fork on Launchad: .. code-block:: bash $ git push lpme:Products.CMFCore - Create a merge proposal from the branch of their fork to the appropriate master / release branch of ZF's repository via the LP UI. Maintainer Workflow: Github - Maintainers will work with the Github repository as the primary repository for a CMF project, using the normal patterns for other ZF repositories hosted at Github (checking for contributor status, etc.) - The canonical location for bug reports will be on Github. - We will enable continuous integration for pull requests and merges via Travis-CI. - After review by a maintainer, and assuming the CI passes,
Re: [Zope-CMF] A Tale of Two Repositories
Products.CMFTopic is now moved to Github / Launchpad: $ svn log -r HEAD \ svn+ssh://svn.zope.org/repos/main/Products.CMFTopic/trunk r130523 | tseaver | 2015-05-22 19:01:00 -0400 (Fri, 22 May 2015) | 8 lines Note source moved to Github/Launchpad. See: https://github.com/zopefoundation/Products.CMFTopic.git https://git.launchpad.net/~zope-cmf/zope-cmftopic/+git/zope-cmftopic as described in: http://permalink.gmane.org/gmane.comp.web.zope.cmf/19202. Tres. -- === Tres Seaver +1 540-429-0999 tsea...@palladion.com Palladion Software Excellence by Designhttp://palladion.com ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Products.DCWorkflow now moved to Github/Launchpad: $ svn log -r HEAD / svn+ssh://svn.zope.org/repos/main/Products.DCWorkflow/trunk - r130527 | tseaver | 2015-05-22 21:02:17 -0400 (Fri, 22 May 2015) | 8 lines Note source moved to Github/Launchpad. See: https://github.com/zopefoundation/Products.DCWorklfow.git https://git.launchpad.net/~zope-cmf/zope-dcworkflow/+git/zope-dcworkflow as described in: http://permalink.gmane.org/gmane.comp.web.zope.cmf/19202. - - -- === Tres Seaver +1 540-429-0999 tsea...@palladion.com Palladion Software Excellence by Designhttp://palladion.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJVX9HsAAoJEPKpaDSJE9HYmdIP/10iBJi8zeTwkTGxtFq5aGd6 yAaxBikf7ECLT69oLWh0lzIH40JGy4WGSyca0MEXx3BVqF88I8wpVHqNErQr2obj XuX3ChF0k7nO136CW0BYzas8FRUP3Qeck57kGxCQritK6ilZSyiJRAvALoJt+bTr M+K4CF65GYDsywohG9LP+RkDWiCGtIbNbfFOQxr/yP43EW9Bxs2KczTRjJsXQcQr fCLvq+FPsF2n2f6a+t0bbuNZxDR0PGdeFSKv4NzBtJUMCmJsF+eF1d4YcZHNIdoD QYAy0BqzkRKvVphRa+1eq2bMGJSdQKSPp2JO1JNOqs9j/uJdktOTg2+SjT8D6UN7 lGslVmybIp9G2m1Tq1vzo4uHEEgqXSDuxic6ziX+UXQ0mDPCJxAUiod5QaINVR0B BPQsB0iEKIOsYVZthnZ5naybM69yC0B6n7iAfzzvsqaWCKotxUG7DAn5QbZRzveo oNhkLdnsP+QbnI1OxePq5nYJh3VDi6I+6n9zRUqKT86hpfjyUgm8XNcbwBPXoq7Z zfjYOheBOlTnmgCvQSQlYSB1FSCvJUkzf0b2u0P9NCVOxtuGpXhISnCJSlozBxMc yT0u593MTDoSiCthjPseCtoSCiDVeLEgrxu946BbIRCd6/oh7wYjyotPHD1mTKxs Fh9EaxvBa7adQePCbllr =q0rV -END PGP SIGNATURE- ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Products.CMFCore is now moved to Github / Launchpad: $ svn log -r HEAD \ svn+ssh://svn.zope.org/repos/main/Products.CMFCore/trunk - r130521 | tseaver | 2015-05-22 17:04:03 -0400 (Fri, 22 May 2015) | 8 lines Note source moved to Github/Launchpad. See: https://github.com/zopefoundation/Products.CMFCore.git https://git.launchpad.net/~zope-cmf/zope-cmfcore/+git/zope-cmfcore as described in: http://permalink.gmane.org/gmane.comp.web.zope.cmf/19202. - - -- === Tres Seaver +1 540-429-0999 tsea...@palladion.com Palladion Software Excellence by Designhttp://palladion.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJVX5oyAAoJEPKpaDSJE9HY9RMQALoNMqbcwB/r6AOHGEE/qDZ8 JQLoI/438MQiILq0kTruaGvzmKKAda6SL0+9+tsJPheJ2KUiVHl6yc6BTbAYv+Xp hRafirK2qzIkc3/69xQHVfCJglAC4AqPeimd7/dNcx5H3fCnrq1Akvtl6LGLQPp8 LaTWs+a/9IaMh/zaXSl8oD0OeHwIYbBJ9XlpIbdlsq4K99CzK6zl0Qwjt+RnJZF7 4YVudeoDUmbU0DFznz6yztPL89yI8xA0Bigw4OSN/0XVSw9p3PMt2wSp/5/JCqQ9 K9b4Y3jD1imvdbPS45mksJ1yBkvN1diveBOBxuQO7kS//Af+17precIMb43pP3fm kxcFAn/fR+n7ySiXc9wc9tsgMNmB7TKaA1udd98AunnKgBLY9pJcoJgL/voN2TDO DaRewmL89WVtpVX9gAhOO6S7yoSQIfSg1rkjVx3XD8cVcI3MFZoen4jm6SiLDqDu wE2xrLXZ6AFttSvYPjeAtoXOx8CF8N6vE33FIR3O5bh6g49C3alptRsNqaQMSn9Q eZHlJtzI2+OqkA9sxMIAiTrGfKblAYDcSG2b+rmyHR9vLFn4pt8nDZmXabodgNdb mpndSvsb7rgTLOhdHP10LgvkYDpVKXwOCE02t4cWHWe+NaFcdVejuAi6yAAcP7q8 Oq2MdmIh8Ajk7wsVKEMP =hMh/ -END PGP SIGNATURE- ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
Products.CMFDefault is now moved to Github / Launchpad: $ svn log -r HEAD \ svn+ssh://svn.zope.org/repos/main/Products.CMFDefault/trunk r130522 | tseaver | 2015-05-22 18:45:38 -0400 (Fri, 22 May 2015) | 8 lines Note source moved to Github/Launchpad. See: https://github.com/zopefoundation/Products.CMFDefault.git https://git.launchpad.net/~zope-cmf/zope-cmfdefault/+git/zope-cmfdefault as described in: http://permalink.gmane.org/gmane.comp.web.zope.cmf/19202. Tres. -- === Tres Seaver +1 540-429-0999 tsea...@palladion.com Palladion Software Excellence by Designhttp://palladion.com ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 05/15/2015 07:07 AM, Maurits van Rees wrote: Tres Seaver schreef op 14-05-15 om 21:14: Contributor Workflow: Github - Github-based contributors will follow normal Github workflow patterns: - Fork the repository of interest via the Github UI. If they have contributor acccess to the original repository, they can of course create a branch in this original github repository. I class contributor as distinct from maintainer, based on exactly those rights, although we might want to adopt a pattern where even maintainers function as though they were contributors, submitting pull requests for review by another maintainer. I was going to say: the same is true for Launchpad, but on Launchpad we should of course not do any manual changes to the original repository, because it is meant to be only touched by the automatic synchronisation. I don't have enough Git-fu to work out how to automate two-way synchronization, which is why I described having the LP repository be a read-only mirror. The Launchpad repository will be synched automatically, whether by the cron job or by the built-in Launchpad mirroring. Does anyone know if we can make the Launchpad repository read-only except for the synchronization? This would prevent accidental commits. Well, I guess the access rights can be tweaked. If the repo can only be written to by one Zope Foundation or CMF account, this would prevent accidental commits by individual contributors. If Launchpad supports it, then having the commit rights restricted to the mirroring process would be great. Sounds good to me. Tres. - -- === Tres Seaver +1 540-429-0999 tsea...@palladion.com Palladion Software Excellence by Designhttp://palladion.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJVV7x5AAoJEPKpaDSJE9HYz6YQAIFqpC3pHG8lr1RE3N3DNtw/ Ijyo9tlRhIlKWIX4HGcOk9IqW3+E95Y4jZlgbYIREONc0+GDJAMZcT0qhEZrcihD 93aT55dutC3SqFx/QHqQoPLI8jjumYjnXxbUxPwajSfTR8Hffi62LsGmQjjCk6cK bM3N7HjCaYiFNy/sAV0hIFCbS8Ps1s1EzdcQF8HJV/ls2B2X26CQR9zoe4OQBSJB Zb/KrTHr0HY/FVMRyV4JNw6oMgbDtQ5sEzmQ6drUtsKIHyBfK2qMqwlIgqc4e4KS RsXg34ZxEA5ll+wmW0iqF7LE+IIbtNI5NVXo3IZU+aZtRKAWYpxQ8AzsyD5G/mzA OEVKXuWn7n7u6qwzcRYrHtyUk1VmxrBNN86zpeRU2bJYSK03Pp55XKfiq/OeeHn2 vQBlXfpng4yw9PkCgoSYLtpXKvfcRQZ30IC8eeQcLuO78xYZSWapT7rg1cXFcd9H 0Ug5pxWkarRSZZMrsivoQTcbvRK3nFsgMPi787BSknk6L6DzXJNysRO/Tghd5HGP D4Sx5iRVYVbw07IHsv/7QsVDWtuL8RvoSddalOy3fuMiDYWUrPQDK4t1KF4Uf5q4 DKVT65+00tYYmnBnFXSeUHHHFSWshf61fsUFcFqvRnYDhltZKBCNMg6Kruj+eHG+ 6xW3qWt+x8g+KEPRkk6i =RY1y -END PGP SIGNATURE- ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 05/15/2015 07:55 AM, Charlie Clark wrote: Am .05.2015, 12:11 Uhr, schrieb yuppie y.2...@wcm-solutions.de: thanks for working on this issue. I'm not very happy about the proposed solution because it makes the GitHub repository the primary repository and the canonical location for bug reports. But compromises never make everybody happy. For the record, like yuppie I'm not happy with Github as the canonical repository either. Is this because it's easier to use travis-ci? Or simply because it's more convenient to have everything in one place? Moving the bug reporting to Github is open for debate: I prefer it, largely for the ability to close bugs via commit messages. The canonicalness of the actual repository is slightly spurious: the true canonical version is the local repository of the maintainer who makes relesaes. I'm happy about your proposal because it looks like a practicable solution everybody can live with. I can live with it because I haven't made a commit in at least two years. Tres. - -- === Tres Seaver +1 540-429-0999 tsea...@palladion.com Palladion Software Excellence by Designhttp://palladion.com -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJVV7z1AAoJEPKpaDSJE9HYOYsP/j/Fa2uWJRRDriHtlWKFQF5e t+l9XveK2RxwMrmo1WGsDbzefjZ6YwyePG5lLpLk67zFtNNlaOPtfy+CLfMvzFrh wn5gsgGG9mZWHLTEfvS9Vm5lRjuWZHRrpS6UqUCVTyrKeS+R3sheZl4UVbO4CL98 4+e+Rz8DoTyZqdCLnyNebFG0PtIuf3lsNgLf2B6dHDKF2lmA+sHEJSM6xmDBeajS rf7IjZrSnWs0IUXFUhiwBVYCq+XC2qDYWy1zk2/kIGjsX1AwF/t22AF27GPAUoWR 9iowop4N8CNphqVQWO1oOgQPNsQYH1h1asvTRNbLepDzqNHae+yhkAQ66frSnb29 zcbYwGoWGlv6pE5BQhdoGgp0jHkCOoCrHQOUEjzDStiJxjbd8lvJ0wJM/cwgU0CX Zalu+ecmOUy7kx2nHBrMCrI8fJ1DGw/grDpdB+9fu7L3hfwcjOrQkFer9RQXwTek VU4vOCihQGfySR5rQVGHiy4ltI/hDnPfyye8zEs//sl0J6AFM5oT6CT2FrDwqCXN EJZcjzybQ2jy9JVpD+EIPMQj8oNwfOPSN/QwYIZ7UjfftNvdw1kWZI2hdbOH35c5 tq73j/Uq+1IrFby37Run9RZySQb+7VbaHQrKDy9MEJnOys4IcYtCjugrfAvoWjGR 4a/6vTKTbTlIWQFi+fQi =FRNt -END PGP SIGNATURE- ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
Am .05.2015, 12:11 Uhr, schrieb yuppie y.2...@wcm-solutions.de: thanks for working on this issue. I'm not very happy about the proposed solution because it makes the GitHub repository the primary repository and the canonical location for bug reports. But compromises never make everybody happy. For the record, like yuppie I'm not happy with Github as the canonical repository either. Is this because it's easier to use travis-ci? Or simply because it's more convenient to have everything in one place? I'm happy about your proposal because it looks like a practicable solution everybody can live with. I can live with it because I haven't made a commit in at least two years. Charlie -- Charlie Clark Managing Director Clark Consulting Research German Office Kronenstr. 27a Düsseldorf D- 40217 Tel: +49-211-600-3657 Mobile: +49-178-782-6226 ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
Re: [Zope-CMF] A Tale of Two Repositories
Tres Seaver schreef op 14-05-15 om 21:14: Contributor Workflow: Github - Github-based contributors will follow normal Github workflow patterns: - Fork the repository of interest via the Github UI. If they have contributor acccess to the original repository, they can of course create a branch in this original github repository. I was going to say: the same is true for Launchpad, but on Launchpad we should of course not do any manual changes to the original repository, because it is meant to be only touched by the automatic synchronisation. The Launchpad repository will be synched automatically, whether by the cron job or by the built-in Launchpad mirroring. Does anyone know if we can make the Launchpad repository read-only except for the synchronization? This would prevent accidental commits. Well, I guess the access rights can be tweaked. If the repo can only be written to by one Zope Foundation or CMF account, this would prevent accidental commits by individual contributors. Sounds good to me. -- Maurits van Rees: http://maurits.vanrees.org/ Zest Software: http://zestsoftware.nl ___ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests
