Skip to content

BUG: Rename pydata to pandas-dev in merge-pr.py #14447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 19, 2016
+3 −10
Merged

BUG: Rename pydata to pandas-dev in merge-pr.py #14447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd7c284
BUG: Rename pydata to pandas-dev in merge-pr
gfyoung Oct 18, 2016
342093e
MAINT: merge-pr cleanup
gfyoung Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions scripts/merge-py.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
# Remote name where results pushed
PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "upstream")

GITHUB_BASE = "https://github.com/pydata/" + PROJECT_NAME + "/pull"
GITHUB_API_BASE = "https://api.github.com/repos/pydata/" + PROJECT_NAME
GITHUB_BASE = "https://github.com/pandas-dev/" + PROJECT_NAME + "/pull"
GITHUB_API_BASE = "https://api.github.com/repos/pandas-dev/" + PROJECT_NAME

# Prefix added to temporary branches
BRANCH_PREFIX = "PR_TOOL"
Expand Down Expand Up @@ -124,7 +124,7 @@ def clean_up():
run_cmd("git branch -D %s" % branch)


# merge the requested PR and return the merge hash
# Merge the requested PR and return the merge hash
def merge_pr(pr_num, target_ref):

pr_branch_name = "%s_MERGE_PR_%s" % (BRANCH_PREFIX, pr_num)
Expand Down Expand Up @@ -244,13 +244,6 @@ def fix_version_from_branch(branch, versions):
branch_ver = branch.replace("branch-", "")
return filter(lambda x: x.name.startswith(branch_ver), versions)[-1]


# branches = get_json("%s/branches" % GITHUB_API_BASE)
# branch_names = filter(lambda x: x.startswith("branch-"),
# [x['name'] for x in branches])
# Assumes branch names can be sorted lexicographically
# latest_branch = sorted(branch_names, reverse=True)[0]

pr_num = input("Which pull request would you like to merge? (e.g. 34): ")
pr = get_json("%s/pulls/%s" % (GITHUB_API_BASE, pr_num))

Expand Down