Made the following changes so that it works in Python3:
1. Use `print()` instead of `print`
2. Use urllib instead of urllib2
3. Decode all of the cmd outputs from binary to string using UTF-8
4. Use `input` instead of `raw_input`
5. Use `next()` on the iterator returned by `filter()` instead `__get_item__()`
6. Fix any error returned by `pylint`.
Author: José Armando García Sancio <jsancio@gmail.com>
Reviewers: David Jacot <djacot@confluent.io>
Closes#11536 from jsancio/minor-merge-pr-script
It seems like it's sufficient to be able to refer to it in the PR.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Rajini Sivaram <rajinisivaram@googlemail.com>
Closes#4202 from ijuma/exclude-committer-checklist-when-merging
- Remove "list commits" since we never use it
- Fix release branch detection to just look
for branches that start with digits
- Make script executable
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Guozhang Wang <wangguoz@gmail.com>
Closes#4067 from ijuma/merge-script-improvements
There won't be a 0.10.3.0.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Jason Gustafson <jason@confluent.io>
Closes#2628 from ijuma/bump-version-to-0.11.0.0-SNAPSHOT
Note: This goes only to trunk. 0.10.0 branch will need a separate PR with different versions.
Author: Gwen Shapira <cshapi@gmail.com>
Reviewers: Ismael Juma <ismael@juma.me.uk>, Ewen Cheslack-Postava <ewen@confluent.io>
Closes#1109 from gwenshap/minor-fix-version-trunk
Also update `kafka-merge-pr.py` and `tests/kafkatest/__init__.py`.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Ewen Cheslack-Postava <ewen@confluent.io>
Closes#963 from ijuma/update-trunk-0.10.0.0-SNAPSHOT
Simplified the logic to choose the default fix version. We just hardcode
it for `trunk` and try to compute it based on the branch name for the
rest.
Removed logic that tries to handle forked release branches as it
seems to be specific to how the Spark project handles their JIRA.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Guozhang Wang
Closes#238 from ijuma/kafka-2548-merge-pr-tool-4-segment-fix-version
If there is a single commit in the PR, then it's never listed.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Guozhang Wang
Closes#136 from ijuma/kafka-2430-optional-listing-commits and squashes the following commits:
64f1aec [Ismael Juma] Listing of PR commits in commit message should be optional
This fix should be fine for Linux and OS X. Not sure about Windows though. This is a very specific fix for new functionality added in KAFKA-2384. There are other places where a similar error could occur, but are less likely.
The script doesn't really support Unicode input at the moment.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Guozhang
Closes#109 from ijuma/kafka-2384-hotfix and squashes the following commits:
0ab8958 [Ismael Juma] Encode/decode to utf-8 for commit title IO in kafka-merge-pr.py
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Guozhang
Closes#105 from ijuma/kafka-2384-override-commit-message-title and squashes the following commits:
e042242 [Ismael Juma] Support overriding of commit message title in kafka-merge-pr.py
The first 4 commits are adapted from changes that have been done to the Spark version and the last one is the feature that gwenshap asked for.
Author: Ismael Juma <ismael@juma.me.uk>
Reviewers: Gwen Shapira <cshapi@gmail.com>
Closes#90 from ijuma/kafka-2344-merge-pr-improvements and squashes the following commits:
900c371 [Ismael Juma] Allow reviewers to be entered during merge
ac06347 [Ismael Juma] Allow primary author to be overridden during merge
b309829 [Ismael Juma] Set JIRA resolution to "Fixed" instead of relying on default transition
0c69a64 [Ismael Juma] Check return value of doctest.testmod()
061cdce [Ismael Juma] Fix instructions on how to install the `jira-python` library
The right command to get the branch name is `git rev-parse --abbrev-ref HEAD` instead of `git rev-parse HEAD`. The latter gives the commit hash causing a detached branch when we checkout to it. Seems like a bug we inherited from the Spark script.
Author: Ismael Juma <ismael@juma.me.uk>
Closes#84 from ijuma/kafka-2328-merge-script-no-detached-branch and squashes the following commits:
ae201dd [Ismael Juma] KAFKA-2328; merge-kafka-pr.py script should not leave user in a detached branch
Added unit tests as well. These fail without the fix, but pass with the fix.
Author: Geoff Anderson <geoff@confluent.io>
Closes#73 from granders/KAFKA-2327 and squashes the following commits:
52a2085 [Geoff Anderson] Cleaned up unecessary toString calls
23b3340 [Geoff Anderson] Fixes KAFKA-2327
Satish Duggana
Yi-Sheng Lien
Mickael Maison
A. Sophie Blee-Goldman
José Armando García Sancio
Bruno Cadonna
David Jacot
Konstantine Karantasis
Matthias J. Sax
John Roesler
bill
Randall Hauch
David Arthur
Manikumar Reddy
Colin Patrick McCabe
Matthias J. Sax
Dong Lin
Rajini Sivaram
Ismael Juma
Damian Guy
Ismael Juma
Guozhang Wang
Ewen Cheslack-Postava
Jason Gustafson
Gwen Shapira
Geoff Anderson