From 8e42bbe69f4d074785ff25ebfcbba2869d04755e Mon Sep 17 00:00:00 2001
From: Nabil Freij <nabil.freij@gmail.com>
Date: Fri, 6 Dec 2024 20:00:52 -0800
Subject: [PATCH] Update pyproject.toml

---
 pyproject.toml | 84 ++++----------------------------------------------
 1 file changed, 6 insertions(+), 78 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 59199f4..1b37ef5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -59,20 +59,7 @@ docs = [
   "sphinx-automodapi",
   "sphinx-changelog",
   "sunpy-sphinx-theme",
-  "packaging",
-<<<<<<<
-=======
-]
-
-[project.urls]
-Homepage = "https://github.com/sunpy/sunkit-pyvista"
-Download = "https://pypi.org/project/sunkit-pyvista"
-
-[tool.setuptools]
-zip-safe = false
->>>>>>>
   "sunkit_pyvista[all]",
-  "sphinx-changelog",
   "sphinx-design",
   "sphinx-gallery",
   "sunkit-magex",
@@ -80,6 +67,10 @@ zip-safe = false
 ]
 dev = ["sunkit_pyvista[tests,docs]"]
 
+[project.urls]
+Homepage = "https://github.com/sunpy/sunkit-pyvista"
+Download = "https://pypi.org/project/sunkit-pyvista"
+
 [tool.setuptools]
 zip-safe = false
 include-package-data = true
@@ -95,65 +86,6 @@ namespaces = false
 [tool.setuptools_scm]
 write_to = "sunkit_pyvista/_version.py"
 
-[ tool.gilesbot ]
-  [ tool.gilesbot.pull_requests ]
-    enabled = true
-
-  [ tool.gilesbot.towncrier_changelog ]
-    enabled = true
-    verify_pr_number = true
-    changelog_skip_label = "No Changelog Entry Needed"
-    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/sunpy/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."
-
-[tool.towncrier]
-    package = "sunkit_pyvista"
-    filename = "CHANGELOG.rst"
-    directory = "changelog/"
-    issue_format = "`#{issue} <https://github.com/sunpy/sunkit-pyvista/pull/{issue}>`__"
-    title_format = "{version} ({project_date})"
-
-    [[tool.towncrier.type]]
-      directory = "breaking"
-      name = "Breaking Changes"
-      showcontent = true
-
-    [[tool.towncrier.type]]
-      directory = "removal"
-      name = "Removals"
-      showcontent = true
-
-    [[tool.towncrier.type]]
-      directory = "deprecations"
-      name = "Deprecations"
-      showcontent = true
-
-    [[tool.towncrier.type]]
-      directory = "feature"
-      name = "Features"
-      showcontent = true
-
-    [[tool.towncrier.type]]
-      directory = "bugfix"
-      name = "Bug Fixes"
-      showcontent = true
-
-    [[tool.towncrier.type]]
-      directory = "doc"
-      name = "Documentation"
-      showcontent = true
-
-<<<<<<<
-    [[tool.towncrier.type]]
-      directory = "trivial"
-      name = "Internal Changes"
-      showcontent = true
-=======
-[tool.setuptools_scm]
-write_to = "sunkit_pyvista/_version.py"
-
 [tool.gilesbot]
   [tool.gilesbot.pull_requests]
   enabled = true
@@ -162,12 +94,9 @@ write_to = "sunkit_pyvista/_version.py"
   enabled = true
   verify_pr_number = true
   changelog_skip_label = "No Changelog Entry Needed"
-  help_url = "https://github.com//blob/main/changelog/README.rst"
-
+  help_url = "https://github.com/sunpy/sunkit-pyvista/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//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//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
@@ -176,7 +105,7 @@ write_to = "sunkit_pyvista/_version.py"
   package = "sunkit-pyvista"
   filename = "CHANGELOG.rst"
   directory = "changelog/"
-  issue_format = "`#{issue} https:github.com//changelog/pull/{issue}>`__"
+  issue_format = "`#{issue} <https://github.com/sunpy/sunkit-pyvista/pull/{issue}>`__"
   title_format = "{version} ({project_date})"
 
   [[tool.towncrier.type]]
@@ -213,4 +142,3 @@ write_to = "sunkit_pyvista/_version.py"
   directory = "trivial"
   name = "Internal Changes"
   showcontent = true
->>>>>>>