diff --git a/.bumpversion.cfg b/.bumpversion.cfg index df1b76923..309ab14cd 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.22.0.dev +current_version = 0.23.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 9122ea225..1d4100e7e 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-339-gf0d923e +2021.08.26-341-g5cb6e90 diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 7c4bee711..e2f5b8b61 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -71,6 +71,33 @@ jobs: [noissue] delete-branch: true - uses: "actions/checkout@v4" + with: + fetch-depth: 0 + path: "pulp_ansible" + ref: "0.22" + + - name: "Run update" + working-directory: "pulp_ansible" + run: | + ../plugin_template/scripts/update_ci.sh + + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v6" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulp_ansible" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 0.22" + body: "" + branch: "update-ci/0.22" + base: "0.22" + commit-message: | + Update CI files + + [noissue] + delete-branch: true + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulp_ansible" diff --git a/CHANGES/+deprecation_api.bugfix b/CHANGES/+deprecation_api.bugfix deleted file mode 100644 index 62ca523e9..000000000 --- a/CHANGES/+deprecation_api.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed the api for direct creation of collection_deprecated content. diff --git a/CHANGES/+failsafe_avatar.bugfix b/CHANGES/+failsafe_avatar.bugfix deleted file mode 100644 index 8ac78add5..000000000 --- a/CHANGES/+failsafe_avatar.bugfix +++ /dev/null @@ -1 +0,0 @@ -Changed avatar download to allow graceful failure on mismatching image checksum. diff --git a/CHANGES/+new-docs-ci.misc b/CHANGES/+new-docs-ci.misc deleted file mode 100644 index 91a157185..000000000 --- a/CHANGES/+new-docs-ci.misc +++ /dev/null @@ -1 +0,0 @@ -Added the Unified Docs CI build-check on PRs. diff --git a/CHANGES/+pulpcore.removal b/CHANGES/+pulpcore.removal deleted file mode 100644 index a9b4a5fb1..000000000 --- a/CHANGES/+pulpcore.removal +++ /dev/null @@ -1 +0,0 @@ -Bumped `pulpcore` requirement to `>=3.39.0` and dropped `python 3.8` support. diff --git a/CHANGES/1608.bugfix b/CHANGES/1608.bugfix deleted file mode 100644 index 89579b6c8..000000000 --- a/CHANGES/1608.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed syncing progress report, `Parsing CollectionVersion Metadata`, total count when using `signed_only=True`. diff --git a/CHANGES/1691.bugfix b/CHANGES/1691.bugfix deleted file mode 100644 index 6e538b5b0..000000000 --- a/CHANGES/1691.bugfix +++ /dev/null @@ -1 +0,0 @@ -Duplicate Collection uploads no longer return 400s. diff --git a/CHANGES/1754.doc b/CHANGES/1754.doc deleted file mode 100644 index 2c2dab3db..000000000 --- a/CHANGES/1754.doc +++ /dev/null @@ -1 +0,0 @@ -Convert docs to new style. diff --git a/CHANGES/1764.bugfix b/CHANGES/1764.bugfix deleted file mode 100644 index a90abab72..000000000 --- a/CHANGES/1764.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed AnsibleNamespaceMetadata not being exported. diff --git a/CHANGES/1772.bugfix b/CHANGES/1772.bugfix deleted file mode 100644 index 8140a7b5c..000000000 --- a/CHANGES/1772.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed a bug failing sync on namespace metadata when avatar_sha256 is missing. diff --git a/CHANGES/1833.bugfix b/CHANGES/1833.bugfix deleted file mode 100644 index d758a1dc4..000000000 --- a/CHANGES/1833.bugfix +++ /dev/null @@ -1 +0,0 @@ -Add ansible hostname to API v3 cache key \ No newline at end of file diff --git a/CHANGES/1836.bugfix b/CHANGES/1836.bugfix deleted file mode 100644 index 519712fe2..000000000 --- a/CHANGES/1836.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed import failing to associate signatures and marks with their collection version. diff --git a/CHANGES/1868.bugfix b/CHANGES/1868.bugfix deleted file mode 100644 index 8e9af4db9..000000000 --- a/CHANGES/1868.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed sync failing on undownloadable namespace avatars. diff --git a/CHANGES/691.removal b/CHANGES/691.removal deleted file mode 100644 index f0c95705f..000000000 --- a/CHANGES/691.removal +++ /dev/null @@ -1 +0,0 @@ -Removed the galaxy v2 apis. The v3 apis should be used instead. diff --git a/docs/conf.py b/docs/conf.py index a3c27dafe..99b658106 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -73,9 +73,9 @@ # built documents. # # The short X.Y version. -version = "0.22.0.dev" +version = "0.23.0.dev" # The full version, including alpha/beta/rc tags. -release = "0.22.0.dev" +release = "0.23.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 b98c79288..f050809ae 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.22.0.dev" + version = "0.23.0.dev" python_package_name = "pulp-ansible" diff --git a/setup.py b/setup.py index eb29a8171..d94de288e 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-ansible", - version="0.22.0.dev", + version="0.23.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 c2ac3c668..a7813887a 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-330-g0b7d0c1 +# generated with plugin_template@2021.08.26-341-g5cb6e90 api_root: /pulp/ black: true @@ -30,7 +30,7 @@ flake8_ignore: [] github_org: pulp issue_tracker: github kanban: true -latest_release_branch: null +latest_release_branch: '0.22' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8