From f184ad260bc73a91b05989868fd1a8b86c0064a2 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Fri, 2 Feb 2024 18:45:37 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .github/workflows/create-branch.yml | 2 +- .github/workflows/update_ci.yml | 27 +++++++++++++++++++++++++++ CHANGES/1275.misc | 2 -- CHANGES/1444.bugfix | 2 -- CHANGES/489.misc | 1 - CHANGES/507.feature | 3 --- docs/conf.py | 4 ++-- pulp_container/app/__init__.py | 2 +- setup.py | 2 +- template_config.yml | 2 +- 11 files changed, 34 insertions(+), 15 deletions(-) delete mode 100644 CHANGES/1275.misc delete mode 100644 CHANGES/1444.bugfix delete mode 100644 CHANGES/489.misc delete mode 100644 CHANGES/507.feature diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f5faa3efc..9ba951f98 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.18.0.dev +current_version = 2.19.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/workflows/create-branch.yml b/.github/workflows/create-branch.yml index cdebcfa5d..fdd672bd2 100644 --- a/.github/workflows/create-branch.yml +++ b/.github/workflows/create-branch.yml @@ -33,7 +33,7 @@ jobs: - name: "Install python dependencies" run: | echo ::group::PYDEPS - pip install bump2version jinja2 pyyaml packaging + pip install bump2version jinja2 pyyaml echo ::endgroup:: - name: "Setting secrets" diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index a0479edfc..4f5bb0928 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_container" + ref: "2.18" + + - name: "Run update" + working-directory: "pulp_container" + run: | + ../plugin_template/scripts/update_ci.sh + + - name: "Create Pull Request for CI files" + uses: "peter-evans/create-pull-request@v4" + with: + token: "${{ secrets.RELEASE_TOKEN }}" + path: "pulp_container" + committer: "pulpbot " + author: "pulpbot " + title: "Update CI files for branch 2.18" + body: "" + branch: "update-ci/2.18" + base: "2.18" + commit-message: | + Update CI files + + [noissue] + delete-branch: true + - uses: "actions/checkout@v4" with: fetch-depth: 0 path: "pulp_container" diff --git a/CHANGES/1275.misc b/CHANGES/1275.misc deleted file mode 100644 index 715055d3f..000000000 --- a/CHANGES/1275.misc +++ /dev/null @@ -1,2 +0,0 @@ -Ensured repositories are correctly retrieved or initialized when handling client's parallel blob -uploading. diff --git a/CHANGES/1444.bugfix b/CHANGES/1444.bugfix deleted file mode 100644 index 8369792da..000000000 --- a/CHANGES/1444.bugfix +++ /dev/null @@ -1,2 +0,0 @@ -Added ``application/vnd.docker.distribution.manifest.v1+prettyjws`` to the list of accepted -media types retrieved from a remote registry. diff --git a/CHANGES/489.misc b/CHANGES/489.misc deleted file mode 100644 index 8b7a5707b..000000000 --- a/CHANGES/489.misc +++ /dev/null @@ -1 +0,0 @@ -Refactored ``get_dr_push()`` to be more readable. diff --git a/CHANGES/507.feature b/CHANGES/507.feature deleted file mode 100644 index 037ccbb01..000000000 --- a/CHANGES/507.feature +++ /dev/null @@ -1,3 +0,0 @@ -Added support for pull-through caching. Users can now configure a dedicated distribution and remote -linked to an external registry without the need to create and mirror repositories in advance. Pulp -downloads missing content automatically if requested and acts as a caching proxy. diff --git a/docs/conf.py b/docs/conf.py index 825695a79..2f44244d1 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -74,9 +74,9 @@ # built documents. # # The short X.Y version. -version = "2.18.0.dev" +version = "2.19.0.dev" # The full version, including alpha/beta/rc tags. -release = "2.18.0.dev" +release = "2.19.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_container/app/__init__.py b/pulp_container/app/__init__.py index 5691a4cb1..fd959a1f4 100644 --- a/pulp_container/app/__init__.py +++ b/pulp_container/app/__init__.py @@ -6,7 +6,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig): name = "pulp_container.app" label = "container" - version = "2.18.0.dev" + version = "2.19.0.dev" python_package_name = "pulp-container" def ready(self): diff --git a/setup.py b/setup.py index dfa9b3ed2..85938d995 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="pulp-container", - version="2.18.0.dev", + version="2.19.0.dev", description="Container plugin for the Pulp Project", long_description=long_description, license="GPLv2+", diff --git a/template_config.yml b/template_config.yml index 5e6781a6a..e24a65fb7 100644 --- a/template_config.yml +++ b/template_config.yml @@ -28,7 +28,7 @@ flake8_ignore: [] github_org: pulp issue_tracker: github kanban: true -latest_release_branch: null +latest_release_branch: '2.18' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8