diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 450b97cbd..df1b76923 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.21.0.dev +current_version = 0.22.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/template_gitref b/.github/template_gitref index d03ba7e18..cd7b27530 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-249-gca8f021 +2021.08.26-250-gf4315cf diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 003749e8b..3bf481458 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 }} diff --git a/.github/workflows/scripts/release.py b/.github/workflows/scripts/release.py index 65e130095..10dd9deb7 100755 --- a/.github/workflows/scripts/release.py +++ b/.github/workflows/scripts/release.py @@ -10,6 +10,7 @@ import os import textwrap import requests +import subprocess from git import Repo from pathlib import Path @@ -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) diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 538e0875f..237ccaae1 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -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 @@ -224,10 +224,10 @@ jobs: path: pulp_ansible committer: pulpbot author: pulpbot - 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 diff --git a/CHANGES/+pulpcore-3.40.feature b/CHANGES/+pulpcore-3.40.feature deleted file mode 100644 index 7aa25a62e..000000000 --- a/CHANGES/+pulpcore-3.40.feature +++ /dev/null @@ -1 +0,0 @@ -Added pulpcore 3.40 compatibility. diff --git a/CHANGES/1598.bugfix b/CHANGES/1598.bugfix deleted file mode 100644 index cd4c0214f..000000000 --- a/CHANGES/1598.bugfix +++ /dev/null @@ -1 +0,0 @@ -Ignore the "users" field in namespace data during sync. diff --git a/CHANGES/1612.feature b/CHANGES/1612.feature deleted file mode 100644 index 95e729dfb..000000000 --- a/CHANGES/1612.feature +++ /dev/null @@ -1 +0,0 @@ -Display the ``count`` attribute in the tags of collections. diff --git a/CHANGES/1623.bugfix b/CHANGES/1623.bugfix deleted file mode 100644 index 6e28a167c..000000000 --- a/CHANGES/1623.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed highest version calculation failing when versions of a collection were created out of order. diff --git a/docs/conf.py b/docs/conf.py index 623593ee3..777acdd0e 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -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. diff --git a/pulp_ansible/app/__init__.py b/pulp_ansible/app/__init__.py index d8e156b72..b98c79288 100644 --- a/pulp_ansible/app/__init__.py +++ b/pulp_ansible/app/__init__.py @@ -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" diff --git a/setup.py b/setup.py index 215f6fb3b..4f92ab972 100755 --- a/setup.py +++ b/setup.py @@ -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+", diff --git a/template_config.yml b/template_config.yml index b2968d89c..3a4f8b61f 100644 --- a/template_config.yml +++ b/template_config.yml @@ -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 plugin_template@2021.08.26-248-g4bfc3e1 +# generated with plugin_template@2021.08.26-250-gf4315cf additional_repos: [] api_root: /pulp/ @@ -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