Skip to content

Commit

Permalink
Bump minor version
Browse files Browse the repository at this point in the history
  • Loading branch information
pulpbot authored and git-hyagi committed Nov 1, 2024
1 parent 73b234b commit 1ab1585
Show file tree
Hide file tree
Showing 20 changed files with 13 additions and 37 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 = 2.22.0.dev
current_version = 2.23.0.dev
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
Expand Down
3 changes: 1 addition & 2 deletions .ci/ansible/Containerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ RUN pip3 install --upgrade pip setuptools wheel && \
{{ " " }}-r ./{{ item.name }}/ci_requirements.txt
{%- endif -%}
{%- endfor %}
{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt \
pipdeptree && \
{{ " " }}-c ./{{ plugins[0].name }}/.ci/assets/ci_constraints.txt && \
rm -rf /root/.cache/pip

{% if pulp_env is defined and pulp_env %}
Expand Down
5 changes: 0 additions & 5 deletions .ci/assets/ci_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,3 @@ pulpcore>=3.21.30,!=3.23.*,!=3.24.*,!=3.25.*,!=3.26.*,!=3.27.*,!=3.29.*,!=3.30.*

tablib!=3.6.0
# 3.6.0: This release introduced a regression removing the "html" optional dependency.



# Newer version seem to have a conflict around packaging, that pip fails to resolve in time. Remove this when this starts to impose an issue.
pipdeptree<=3.23.1
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-387-ge627e91
unknown
2 changes: 1 addition & 1 deletion .github/workflows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,5 @@ if [[ "$TEST" = "azure" ]]; then
fi

echo ::group::PIP_LIST
cmd_prefix bash -c "pip3 list && pipdeptree"
cmd_prefix bash -c "pip3 list"
echo ::endgroup::
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,5 @@ jobs:
docker logs pulp || true
docker exec pulp ls -latr /etc/yum.repos.d/ || true
docker exec pulp cat /etc/yum.repos.d/* || true
docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree"
docker exec pulp bash -c "pip3 list" || true
...
8 changes: 4 additions & 4 deletions .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
with:
fetch-depth: 0
path: "pulp_container"
ref: "2.21"
ref: "2.22"

- name: "Run update"
working-directory: "pulp_container"
Expand All @@ -83,9 +83,9 @@ jobs:
path: "pulp_container"
committer: "pulpbot <[email protected]>"
author: "pulpbot <[email protected]>"
title: "Update CI files for branch 2.21"
branch: "update-ci/2.21"
base: "2.21"
title: "Update CI files for branch 2.22"
branch: "update-ci/2.22"
base: "2.22"
delete-branch: true
- uses: "actions/checkout@v4"
with:
Expand Down
2 changes: 0 additions & 2 deletions CHANGES/+fix-any-type.bugfix

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/1700.bugfix

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/1703.bugfix

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/1712.bugfix

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/1746.bugfix

This file was deleted.

1 change: 0 additions & 1 deletion CHANGES/1751.deprecation

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/1751.feature

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/1759.bugfix

This file was deleted.

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

This file was deleted.

2 changes: 0 additions & 2 deletions CHANGES/479.feature

This file was deleted.

2 changes: 1 addition & 1 deletion pulp_container/app/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class PulpContainerPluginAppConfig(PulpPluginAppConfig):

name = "pulp_container.app"
label = "container"
version = "2.22.0.dev"
version = "2.23.0.dev"
python_package_name = "pulp-container"

def ready(self):
Expand Down
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-container",
version="2.22.0.dev",
version="2.23.0.dev",
description="Container plugin for the Pulp Project",
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 plugin_template@2021.08.26-382-gc88324b
# generated with plugin_template@unknown

api_root: /pulp/
black: true
Expand All @@ -23,7 +23,7 @@ docker_fixtures: false
flake8: true
flake8_ignore: []
github_org: pulp
latest_release_branch: '2.21'
latest_release_branch: '2.22'
lint_requirements: true
os_required_packages: []
parallel_test_workers: 8
Expand Down

0 comments on commit 1ab1585

Please sign in to comment.