Skip to content

Commit

Permalink
Bump minor version
Browse files Browse the repository at this point in the history
[noissue]
  • Loading branch information
pulpbot authored and mdellweg committed Nov 3, 2023
1 parent 0824f6e commit ad7494e
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.21.0.dev
current_version = 0.22.0.dev
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
Expand Down
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-249-gca8f021
2021.08.26-250-gf4315cf
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
inputs:
release:
description: "Release tag (e.g. 3.2.1)"
required: true
before_script:
description: |
Bash code to run before bindings and docs are built. This should only be used when re-running
Expand Down Expand Up @@ -287,9 +286,5 @@ jobs:
echo "GH Issues $GH_ISSUES"
python .ci/scripts/update_github.py
- name: Tweet
continue-on-error: true
run: python .ci/scripts/tweet.py ${{ github.event.inputs.release }}

- name: Create release on GitHub
run: bash .github/workflows/scripts/create_release_from_tag.sh ${{ github.event.inputs.release }}
11 changes: 3 additions & 8 deletions .github/workflows/scripts/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import os
import textwrap
import requests
import subprocess

from git import Repo
from pathlib import Path
Expand Down Expand Up @@ -152,14 +153,8 @@ def main():
release_path = os.path.dirname(os.path.abspath(__file__))
plugin_path = release_path.split("/.github")[0]

version = None
with open(f"{plugin_path}/setup.py") as fp:
for line in fp.readlines():
if "version=" in line:
version = re.split("\"|'", line)[1]
if not version:
raise RuntimeError("Could not detect existing version ... aborting.")
release_version = version.replace(".dev", "")
output = subprocess.check_output(["bump2version", "--dry-run", "--list", "release"])
release_version = re.findall(r"\nnew_version=([0-9.]*)\n", output.decode())[0]

print(f"\n\nRepo path: {plugin_path}")
repo = Repo(plugin_path)
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ jobs:
- uses: actions/checkout@v3
with:
path: pulp_ansible
ref: '0.20'
ref: '0.21'
fetch-depth: 0

- name: Run update
Expand All @@ -224,10 +224,10 @@ jobs:
path: pulp_ansible
committer: pulpbot <[email protected]>
author: pulpbot <[email protected]>
title: 'Update CI files for branch 0.20'
title: 'Update CI files for branch 0.21'
body: '[noissue]'
branch: 'update-ci/0.20'
base: '0.20'
branch: 'update-ci/0.21'
base: '0.21'
commit-message: |
Update CI files
Expand Down
1 change: 0 additions & 1 deletion CHANGES/+pulpcore-3.40.feature

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/1598.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/1612.feature

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/1623.bugfix

This file was deleted.

4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
# built documents.
#
# The short X.Y version.
version = "0.21.0.dev"
version = "0.22.0.dev"
# The full version, including alpha/beta/rc tags.
release = "0.21.0.dev"
release = "0.22.0.dev"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion pulp_ansible/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ class PulpAnsiblePluginAppConfig(PulpPluginAppConfig):

name = "pulp_ansible.app"
label = "ansible"
version = "0.21.0.dev"
version = "0.22.0.dev"
python_package_name = "pulp-ansible"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

setup(
name="pulp-ansible",
version="0.21.0.dev",
version="0.22.0.dev",
description="Pulp plugin to manage Ansible content, e.g. roles",
long_description=long_description,
license="GPLv2+",
Expand Down
4 changes: 2 additions & 2 deletions template_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This config represents the latest values used when running the plugin-template. Any settings that
# were not present before running plugin-template have been added with their default values.

# generated with [email protected]248-g4bfc3e1
# generated with [email protected]250-gf4315cf

additional_repos: []
api_root: /pulp/
Expand All @@ -18,7 +18,7 @@ ci_update_branches:
- '0.16'
- '0.17'
- '0.18'
- '0.20'
- '0.21'
ci_update_docs: true
ci_update_release_behavior: replace-previous-version
cli_package: pulp-cli
Expand Down

0 comments on commit ad7494e

Please sign in to comment.