From cee2b3e4a2e7b31954ca950967330895b05dd86a Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 9 Dec 2024 13:18:29 +0000 Subject: [PATCH] Update pyproject.toml --- pyproject.toml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 47f6c51b4..347b06750 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -106,8 +106,6 @@ write_to = "ndcube/_version.py" enabled = true verify_pr_number = true changelog_skip_label = "No Changelog Entry Needed" -<<<<<<< -======= help_url = "https://github.com/sunpy/ndcube/blob/main/changelog/README.rst" changelog_missing_long = "There isn't a changelog file in this pull request. Please add a changelog file to the `changelog/` directory following the instructions in the changelog [README](https://github.com/sunpy/ndcube/blob/main/changelog/README.rst)." @@ -116,23 +114,13 @@ write_to = "ndcube/_version.py" number_incorrect_long = "The number in the changelog file you added does not match the number of this pull request. Please rename the file." ->>>>>>> - help_url = "https://github.com/sunpy/sunpy/blob/main/changelog/README.rst" - changelog_missing_long = "There isn't a changelog file in this pull request. Please add a changelog file to the `changelog/` directory following the instructions in the changelog [README](https://github.com/sunpy/sunpy/blob/main/changelog/README.rst)." - type_incorrect_long = "The changelog file you added is not one of the allowed types. Please use one of the types described in the changelog [README](https://github.com/sunpy/ndcube/blob/main/changelog/README.rst)" - number_incorrect_long = "The number in the changelog file you added does not match the number of this pull request. Please rename the file." - # TODO: This should be in towncrier.toml but Giles currently only works looks in # pyproject.toml we should move this back when it's fixed. [tool.towncrier] package = "ndcube" filename = "CHANGELOG.rst" directory = "changelog/" -<<<<<<< issue_format = "`#{issue} `__" -======= - issue_format = "`#{issue} https:github.com/sunpy/ndcube/changelog/pull/{issue}>`__" ->>>>>>> title_format = "{version} ({project_date})" [[tool.towncrier.type]]