Skip to content

Commit

Permalink
Fix release-branch due to changes in docs/ layout/location.
Browse files Browse the repository at this point in the history
Also fix up doc-urls in cli- and glue-pyproject.toml.
  • Loading branch information
ggainey committed Aug 22, 2024
1 parent 9c516bd commit ded7782
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
4 changes: 0 additions & 4 deletions .ci/scripts/create_release_branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pulp-glue/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ["."]
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ded7782

Please sign in to comment.