PR should pull config from default branch, master -> main #112
Conversation
Change default branch in github API from master to main.
| @@ -40,7 +40,7 @@ def github_webhook(): | |||
| installation = payload['installation']['id'] | |||
|
|
|||
| repo_name = payload['repository']['full_name'] | |||
| repo = RepoHandler(repo_name, installation=installation) | |||
| repo = RepoHandler(repo_name, branch='main', installation=installation) | |||
There was a problem hiding this comment.
What is the blueprint used for anyway? Will this break things?
| @@ -99,8 +98,7 @@ def verify_pr_number(pr_number, matching_file): | |||
|
|
|||
|
|
|||
| def load_towncrier_config(pr_handler): | |||
| file_content = pr_handler.get_file_contents("pyproject.toml", branch=pr_handler.base_branch) | |||
| config = loads(file_content) | |||
| config = pr_handler.get_repo_config() | |||
There was a problem hiding this comment.
Changing from get_file_contents to get_repo_config seems to break a lot of tests. I don't understand why -- is it some subtlety in how TOML works or I missed something in the mock magic?
| @@ -14,8 +15,8 @@ | |||
| filename = "NEWS.rst" | |||
|
|
|||
| [ tool.testbot ] | |||
| [ tool.testbot.towncrier_changelog ] | |||
| enabled=true | |||
| [[ tool.testbot.towncrier_changelog ]] | |||
There was a problem hiding this comment.
Didn't make any difference but I thought this is more consistent with what is in astropy.
| if not branch: | ||
| branch = self.base_branch | ||
| return super().get_repo_config(branch=branch, path_to_file=path_to_file) | ||
| branch = upstream.default_branch |
There was a problem hiding this comment.
Aside from my comments in #111 this change will probably fix the bug (although I don't know why it's needed). We should however, still be using base branch; we always want to pull the config from the branch the PR is targeting, to allow varying configs over different branches.
| branch = upstream.default_branch | |
| branch = upstream.base_branch |
|
Since you cannot reproduce the bug on your side, I am now not convinced that I went down the correct rabbit hole. Let's debug it a bit more. |
Have PR pull config from upstream default branch. Fix #111
Change default branch in github API from master to main.
TODO