You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by GitBox <gi...@apache.org> on 2022/05/18 03:39:27 UTC
[GitHub] [arrow] kou opened a new pull request, #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
kou opened a new pull request, #13184:
URL: https://github.com/apache/arrow/pull/13184
We use local "git merge" to merge a pull request in
dev/merge_arrow_pr.py.
If we use "git merge" to merge a pull request, GitHub's Web UI shows
"Closed" mark not "Merged" mark in a pull request page. This sometimes
confuses new contributors. "Why was my pull request closed without
merging?" See
https://github.com/apache/arrow/pull/12004#issuecomment-1031619771 for
example.
If we use GitHub API
https://docs.github.com/en/rest/pulls/pulls#merge-a-pull-request to
merge a pull request, GitHub's Web UI shows "Merged" mark not "Closed"
mark. See https://github.com/apache/arrow/pull/13180 for example. I
used GitHub API to merge the pull request.
And we don't need to create a local branch on local repository to
merge a pull request. But we must specify ARROW_GITHUB_API_TOKEN to
run dev/merge_arrow_pr.py.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] cyb70289 commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
cyb70289 commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1141607797
I tried several PRs, looks it's ready to merge?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1139308026
> Looks `committer` becomes `Github` if we merge patches with this new script.
>
> ```
> $ git shortlog -csn HEAD^..HEAD
> 1 GitHub
> ```
Good catch!
It seems that we should use `--group=trailer:signed-off-by` instead of `-c` because we use commiter information for `Signed-off-by` in the merge script.
```console
$ git shortlog -csn 'HEAD^..HEAD'
1 GitHub
$ git shortlog -sn --group=trailer:signed-off-by 'HEAD^..HEAD'
1 Sutou Kouhei
``
> We use the command to collect committers in release notes, maybe it's an issue need to address. There are `5 GitHub` in 8.0 releae notes https://arrow.apache.org/release/8.0.0.html.
It seems that the `GitHub` was caused by pull requests merged with the "merge" button.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1131129063
I can merge #12053 with this...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] cyb70289 commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
cyb70289 commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1139243624
Looks it's related to access token scopes.
I was not able to merge https://github.com/apache/arrow/pull/13191 with the new script. But it works after enabling all the scopes for the access token.
Maybe we can try the scopes incrementally to find the mininal requirement.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] jorisvandenbossche commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
jorisvandenbossche commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1141896016
I could merge https://github.com/apache/arrow/pull/13269 (a minor PR)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1133771030
Good catch!
I've updated the documentation and added support for `~/.config/arrow/merge.py` and prompt for no `ARROW_GITHUB_API_TOKEN` case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1142635227
We didn't get objections on `dev@arrow.apache.org`: https://lists.apache.org/thread/6ok9bj3fs0mgz846963zg3542bkd4m6x
Let's merge this!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] cyb70289 commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
cyb70289 commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1139244397
FYI, I tried enable all `repo` scopes, it doesn't work.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1137855552
Umm... I could merge #13228 but couldn't merge #13113...
```console
$ dev/merge_arrow_pr.py 13113
ARROW_HOME = /home/kou/work/cpp/arrow.kou/dev
PROJECT_NAME = arrow
=== Pull Request #13113 ===
title ARROW-15893: [CI][Python] Add python minimal builds to nightly builds
source raulcd/ARROW-15893-2
target master
url https://api.github.com/repos/apache/arrow/pulls/13113
=== JIRA ARROW-15893 ===
Summary [Python][CI] Exercise Python minimal build examples
Assignee Raúl Cumplido
Components Continuous Integration, Python
Status In Progress
URL https://issues.apache.org/jira/browse/ARROW-15893
Proceed with merging pull request #13113? (y/n): y
Author 1: Raúl Cumplido <ra...@gmail.com>
Traceback (most recent call last):
File "/home/kou/work/cpp/arrow.kou/dev/merge_arrow_pr.py", line 594, in <module>
cli()
File "/home/kou/work/cpp/arrow.kou/dev/merge_arrow_pr.py", line 575, in cli
pr.merge()
File "/home/kou/work/cpp/arrow.kou/dev/merge_arrow_pr.py", line 437, in merge
self.cmd.fail(f'Failed to merge pull request: {message}')
File "/home/kou/work/cpp/arrow.kou/dev/merge_arrow_pr.py", line 289, in fail
raise Exception(msg)
Exception: Failed to merge pull request: Not Found
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] github-actions[bot] commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1129532694
https://issues.apache.org/jira/browse/ARROW-16602
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1131122839
Tested with #13191 that includes `Co-authored-by`.
I don't know why but this approach can merge some pull requests such as #13180 and #13191 but can't merge some pull requests such as #12904 and #13182 ...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1138263973
I could merge #13237.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1136746053
We just need the `public_repo` scope.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1129532719
I used this to merge https://github.com/apache/arrow/pull/13180 but I changed a bit after the merge. So we need to merge another pull request with this before we merge this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou merged pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou merged PR #13184:
URL: https://github.com/apache/arrow/pull/13184
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] wesm commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
wesm commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1142688795
awesome!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1139301746
> Looks it's related to access token scopes. I was not able to merge #13191 with the new script. But it works after enabling all the scopes for the access token. Maybe we can try the scopes incrementally to find the mininal requirement.
Wow! Thanks for the information! I could merge https://github.com/apache/arrow/pull/13113 with `workflow` scope.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] cyb70289 commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
cyb70289 commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1139249058
Looks `committer` becomes `Github` if we merge patches with this new script.
```
$ git shortlog -csn HEAD^..HEAD
1 GitHub
```
We use the command to collect committers in release notes, maybe it's an issue need to address.
There are `5 GitHub` in 8.0 releae notes https://arrow.apache.org/release/8.0.0.html.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] github-actions[bot] commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1129532706
:warning: Ticket **has not been started in JIRA**, please click 'Start Progress'.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] raulcd commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
raulcd commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1132870046
Hi Kou, should update this documentation (https://github.com/apache/arrow/blob/master/dev/README.md?plain=1#L56-L58) to specify that now `ARROW_GITHUB_API_TOKEN` is mandatory then?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] raulcd commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
raulcd commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1138532873
I also got a `404 NOT FOUND` I would have expected to get a `403 FORBIDDEN` based on the github documentation (as I don't have permissions) https://docs.github.com/en/rest/pulls/pulls#merge-a-pull-request:
```
(Pdb) n
> /home/raulcd/open_source/arrow/dev/merge_arrow_pr.py(275)merge_pr()
-> response = requests.put(url, headers=self.headers, json=payload)
(Pdb) payload
{'commit_title': 'ARROW-15893: [CI][Python] Add python minimal builds to nightly builds (#13113)', 'commit_message': 'This PR adds new jobs to the nightly tests in order to exercise the existing Python minimal build examples.\n\nAuthored-by: Raúl Cumplido <ra...@gmail.com>\nSigned-off-by: Raúl Cumplido <ra...@gmail.com>', 'merge_method': 'squash'}
(Pdb) url
'https://api.github.com/repos/apache/arrow/pulls/13113/merge'
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [arrow] kou commented on pull request #13184: ARROW-16602: [Dev] Use GitHub API to merge pull request
Posted by GitBox <gi...@apache.org>.
kou commented on PR #13184:
URL: https://github.com/apache/arrow/pull/13184#issuecomment-1138962826
Thanks for confirming it. It may be a GitHub API bug...
I could merge #13239.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org