From e7ac7bf2194c7c1ee8f682643a688153c340e53a Mon Sep 17 00:00:00 2001
From: Grant Gainey <ggainey@redhat.com>
Date: Thu, 22 Aug 2024 14:58:41 -0400
Subject: [PATCH] Fix release-branch due to changes in docs/ layout/location.

Also fix up doc-urls in cli- and glue-pyproject.toml.
---
 .ci/scripts/create_release_branch.sh                        | 4 ----
 .../.ci/scripts/create_release_branch.sh                    | 6 ------
 pulp-glue/pyproject.toml                                    | 4 ++--
 pyproject.toml                                              | 4 ++--
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.ci/scripts/create_release_branch.sh b/.ci/scripts/create_release_branch.sh
index 09e5a131a..2e55c80c9 100755
--- a/.ci/scripts/create_release_branch.sh
+++ b/.ci/scripts/create_release_branch.sh
@@ -23,10 +23,6 @@ git branch "${NEW_BRANCH}"
 # Clean changelog snippets.
 find CHANGES/ \( -name "*.feature" -o -name "*.bugfix" -o -name "*.removal" -o -name "*.doc" -o -name "*.translation" -o -name "*.devel" -o -name "*.misc" \) -exec git rm -f \{\} +
 
-# Add to version.txt
-sed -i -e "1 i \\${NEW_BRANCH}" docs/versions.txt
-git add docs/versions.txt
-
 bump-my-version bump minor --commit --message $'Bump version to {new_version}' --allow-dirty
 
 git push origin "${NEW_BRANCH}"
diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/scripts/create_release_branch.sh b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/scripts/create_release_branch.sh
index e3e15f948..2e55c80c9 100755
--- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/scripts/create_release_branch.sh	
+++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.ci/scripts/create_release_branch.sh	
@@ -22,12 +22,6 @@ git branch "${NEW_BRANCH}"
 
 # Clean changelog snippets.
 find CHANGES/ \( -name "*.feature" -o -name "*.bugfix" -o -name "*.removal" -o -name "*.doc" -o -name "*.translation" -o -name "*.devel" -o -name "*.misc" \) -exec git rm -f \{\} +
-{%- if cookiecutter.docs %}
-
-# Add to version.txt
-sed -i -e "1 i \\${NEW_BRANCH}" docs/versions.txt
-git add docs/versions.txt
-{%- endif %}
 
 bump-my-version bump minor --commit --message $'Bump version to {new_version}' --allow-dirty
 
diff --git a/pulp-glue/pyproject.toml b/pulp-glue/pyproject.toml
index 440627b17..1f5dc966c 100644
--- a/pulp-glue/pyproject.toml
+++ b/pulp-glue/pyproject.toml
@@ -29,9 +29,9 @@ dependencies = [
 ]
 
 [project.urls]
-documentation = "https://docs.pulpproject.org/pulp_cli/"
+documentation = "https://pulpproject.org/pulp-glue/docs/dev/"
 repository = "https://github.com/pulp/pulp-cli"
-changelog = "https://docs.pulpproject.org/pulp_cli/CHANGES/"
+changelog = "https://pulpproject.org/pulp-cli/changes/"
 
 [tool.setuptools.packages.find]
 where = ["."]
diff --git a/pyproject.toml b/pyproject.toml
index ab6b28b7c..791424a56 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -38,9 +38,9 @@ shell = ["click-shell~=2.1"]
 password-manager = ["SecretStorage>=3.3.3,<3.3.4"]
 
 [project.urls]
-documentation = "https://staging-docs.pulpproject.org/pulp-cli/docs/user/"
+documentation = "https://pulpproject.org/pulp-cli/docs/user/guides/installation/"
 repository = "https://github.com/pulp/pulp-cli"
-changelog = "https://staging-docs.pulpproject.org/pulp-cli/changes/changelog/"
+changelog = "https://pulpproject.org/pulp-cli/changes/"
 
 [project.scripts]
 pulp = "pulp_cli:main"