Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the pulp-cli requirement #95

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Conversation

lubosmj
Copy link
Member

@lubosmj lubosmj commented Apr 24, 2024

This requirement is necessary to bump in order to install pulp-cli-glue==0.25.

[noissue]

@mdellweg
Copy link
Member

Be sure to read the changelog: https://staging-docs.pulpproject.org/pulp-cli/changes/changelog/#0.25.0-pulp-glue-removal

@lubosmj lubosmj marked this pull request as draft April 24, 2024 11:08
@lubosmj lubosmj force-pushed the bump-up-pulp-cli-dep branch 7 times, most recently from 6316918 to cb56156 Compare April 29, 2024 15:40
This requirement is necessary to bump in order to install
pulp-cli-glue==0.25.

[noissue]
@lubosmj lubosmj force-pushed the bump-up-pulp-cli-dep branch from cb56156 to 37690f9 Compare April 29, 2024 16:10
@lubosmj
Copy link
Member Author

lubosmj commented Apr 29, 2024

@mdellweg, do you think I missed out something here? We should release this to really support pulp-glue 0.25 because the last version pins pulp-cli to pulp-glue<0.25.

Also, it is quite surprising that the version in pulp-glue-ostree/__init__.py was not updated along the way.

@lubosmj lubosmj marked this pull request as ready for review April 29, 2024 16:17
Copy link
Member

@mdellweg mdellweg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the things i see in the diff look very familiar.

__version__ = "0.2.0.dev"
__version__ = "0.4.0.dev"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's missing from https://github.com/pulp/pulp-cli-ostree/blob/main/.bumpversion.cfg. So yes you need to sync it manually at least now.

But at this point rather than fixing .bumpversion.cfg, I'd suggest running
../pulp-cli/cookiecutter/apply_templates.py to upgrade to using bump-my-version.

@@ -9,43 +9,50 @@
PulpRemoteContext,
PulpRepositoryContext,
PulpRepositoryVersionContext,
registered_repository_contexts,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment on lines +16 to +17
PLUGIN = "ostree"
RESOURCE_TYPE = "commit"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment on lines -21 to +22
NEEDS_PLUGINS = [PluginRequirement("ostree", min="2.0.0")]
NEEDS_PLUGINS = [PluginRequirement("ostree", specifier=">=2.0.0")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment on lines +54 to +55
def preprocess_entity(self, body: EntityDefinition, partial: bool = False) -> EntityDefinition:
body = super().preprocess_entity(body, partial)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment on lines +11 to +12
translation = get_translation(__package__)
_ = translation.gettext
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

technically not needed, but I'm looking forward to the slovakian translation files. ;)

Comment on lines -104 to +107
distribution_ctx.update(href, body={"repository": ""}, non_blocking=True)
distribution_ctx.update(body={"repository": ""}, non_blocking=True)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment on lines +11 to +12
from pulp_glue.common.i18n import get_translation
from pulp_glue.core.context import PulpArtifactContext
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohhh, this could have changed from the first incarnation of pulp_glue...

👍

Comment on lines -35 to +36
repository_option,
repository_lookup_option,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
Sneaky feature creep... (I think this allows "name or version").

if pulp debug has-plugin --name "ostree" --min-version "2.2.0"
if pulp debug has-plugin --name "ostree" --specifier ">=2.2.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@lubosmj lubosmj marked this pull request as draft April 30, 2024 07:13
@lubosmj lubosmj marked this pull request as ready for review April 30, 2024 07:27
@lubosmj lubosmj marked this pull request as draft April 30, 2024 07:32
@lubosmj lubosmj force-pushed the bump-up-pulp-cli-dep branch from c80a435 to 950a26f Compare April 30, 2024 07:34
@lubosmj lubosmj marked this pull request as ready for review April 30, 2024 07:42
Comment on lines -19 to +36
- python: "3.11"
image_tag: "nightly"
- image_tag: "nightly"
pulp_api_root: "/relocated/djnd/"
- python: "3.8"
image_tag: "3.28"
python: "3.11"
- image_tag: "3.28"
lower_bounds: true
- python: "3.12"
image_tag: "3.26"
- python: "3.8"
image_tag: "3.25"
- python: "3.9"
image_tag: "3.24"
python: "3.8"
- image_tag: "3.26"
python: "3.12"
- image_tag: "3.25"
python: "3.8"
- image_tag: "3.24"
pulp_api_root: "/relocated/djnd/"
- python: "3.10"
image_tag: "3.35"
- python: "3.11"
image_tag: "latest"
python: "3.9"
- image_tag: "3.35"
python: "3.10"
- image_tag: "latest"
lower_bounds: true
python: "3.11"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right dictionaries sorted by keys for stability...
(should be the same as before otherwise.)

{% endif %}

{% if sections[section] %}
{% for category, val in definitions.items() if category in sections[section]%}
#### {{ definitions[category]['name'] }}
#### {{ definitions[category]['name'] }} {: #{{versiondata.version}}{{section_slug}}-{{category}} }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While being a good change, this may or may not lead to a one time hickup when collecting changelogs from previous branches.
At this time, just something to keep an eye on.

@lubosmj lubosmj merged commit 5e6d0ec into pulp:main Apr 30, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants