Allow core/3.55+. #3621

ggainey · 2024-06-18T17:50:45Z

ggainey · 2024-06-18T17:53:31Z

Will undraft after core/3.55 releases and re-run tests.

ggainey · 2024-06-18T19:14:09Z

Oh look, we have work to do...

quba42 · 2024-06-19T09:46:34Z

CHANGES/3620.bugfix

@@ -0,0 +1 @@
+Allow installation with pulpcore/3.55.


Should we somehow sync up this formulation across plugins?

Also: pulp_rpm seems to choose a new ad-hoc formulation each time, from the changelog:

Features: Added pulpcore 3.40 compatibility.

Features: Declares (and requires at least) pulpcore/3.25 compatibility.

Why is this suddenly a bugfix and can we become more consistent?

I added a comment about this on the pulpcore 3.55 discourse channel as well: https://discourse.pulpproject.org/t/pulpcore-3-55-is-coming-soon/1259/3?u=quba42

Why is this suddenly a bugfix and can we become more consistent?

Because my initial thought was that this would be backportable. Alas, no. Good catch, will fix.

Discussion from rpm-team-mtg: previous such releases have been features because they relied-on functionality in the breaking-release, and so needed their lowerboud raised. We generally try to allow the widest possible installation/use of pulp_rpm. If you look at the tests here, the current PR works cleanly back to the current LB ofrpm/3.44.1 (see https://github.com/pulp/pulp_rpm/actions/runs/9573762412/job/26468187737#step:21:53). Given that this change can be backported to previous releases, we mark it as bugfix.

That being said - the desire for there to be some similarity/compatibility for changelog entries across plugins is a good one. Will change.

Of course, what we're really declaring is "compatibility with pulpcore<3.70". Which isn't what any of your example-changelogs say.

Communication wise, I think a changelog entry of "Declared compatibility against pulpcore<3.70" at a point in time when pulpcore 3.55 is latest, has a lot of potential to confuse anyone not intimately acquainted with the Plugin API deprecation policy (most users). So I think something like "Declared compatibility against pulpcore 3.55+" has the following virtues:

While less technically accurate than pulpcore<3.70 it is still true.

It identifies the actual existing breaking change release that now works.

Via the "+" It still hints that there is a range beyond the "3.55" that we also declared compatibility against.

So I quite like this variant. That being said, I think future consistency is more important than the exact schema chosen.

fixes pulp#3620.

dralley · 2024-06-20T19:29:19Z

pulp_rpm/tests/functional/api/test_character_encoding.py

 ):
    """Test whether one can upload an RPM with non-ascii metadata."""
    temp_file = tmp_path / str(uuid.uuid4())
    temp_file.write_bytes(requests.get(RPM_WITH_NON_ASCII_URL).content)
-    artifact = artifacts_api_client.create(temp_file)
+    artifact = pulpcore_bindings.ArtifactsApi.create(temp_file)


I appreciate this cleanup, thanks.

dralley · 2024-06-20T19:29:43Z

pulp_rpm/tests/functional/api/test_pulpimport.py

    def _create_export(
        import_repos=None, export_repos=None, url=RPM_UNSIGNED_FIXTURE_URL, exporter=None
    ):
        if not exporter:
            exporter = create_exporter(import_repos, export_repos, url=url)

-        export_response = exporters_pulp_exports_api_client.create(exporter.pulp_href, {})
+        export_response = pulpcore_bindings.ExportersPulpExportsApi.create(exporter.pulp_href, {})


much much cleaner

patchback · 2024-06-20T19:30:18Z

Backport to 3.27: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.27/1c36b39e2be24f87a97821370ee850cafefddbe6/pr-3621

Backported as #3623

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2024-06-20T19:30:27Z

Backport to 3.26: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 1c36b39 on top of patchback/backports/3.26/1c36b39e2be24f87a97821370ee850cafefddbe6/pr-3621

Backporting merged PR #3621 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/pulp/pulp_rpm.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/3.26/1c36b39e2be24f87a97821370ee850cafefddbe6/pr-3621 upstream/3.26

Now, cherry-pick PR Allow core/3.55+. #3621 contents into that branch:
```
$ git cherry-pick -x 1c36b39e2be24f87a97821370ee850cafefddbe6
```
If it'll yell at you with something like fatal: Commit 1c36b39e2be24f87a97821370ee850cafefddbe6 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x 1c36b39e2be24f87a97821370ee850cafefddbe6
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Allow core/3.55+. #3621 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.26/1c36b39e2be24f87a97821370ee850cafefddbe6/pr-3621

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

ggainey force-pushed the 3630_allow_core_355 branch from 7ef6152 to 72eaf48 Compare June 18, 2024 17:52

ggainey marked this pull request as ready for review June 18, 2024 18:57

ggainey force-pushed the 3630_allow_core_355 branch 7 times, most recently from 6e9c111 to 7e1e230 Compare June 18, 2024 23:51

quba42 reviewed Jun 19, 2024

View reviewed changes

ggainey marked this pull request as draft June 20, 2024 15:33

Allow core/<3.70.

cfd4c95

fixes pulp#3620.

ggainey force-pushed the 3630_allow_core_355 branch from 7e1e230 to cfd4c95 Compare June 20, 2024 16:30

ggainey marked this pull request as ready for review June 20, 2024 16:31

ggainey requested review from dralley and pedro-psb June 20, 2024 17:13

ggainey added backport-3.27 backport-3.26 labels Jun 20, 2024

ggainey enabled auto-merge (rebase) June 20, 2024 19:29

dralley reviewed Jun 20, 2024

View reviewed changes

dralley approved these changes Jun 20, 2024

View reviewed changes

ggainey merged commit 1c36b39 into pulp:main Jun 20, 2024
15 checks passed

patchback bot mentioned this pull request Jun 20, 2024

[PR #3621/1c36b39e backport][3.27] Allow core/3.55+. #3623

Merged

pedro-psb mentioned this pull request Jun 21, 2024

Use new approach to binding fixtures #3468

Open

ggainey deleted the 3630_allow_core_355 branch June 21, 2024 18:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow core/3.55+. #3621

Allow core/3.55+. #3621

ggainey commented Jun 18, 2024

ggainey commented Jun 18, 2024

ggainey commented Jun 18, 2024

quba42 Jun 19, 2024

quba42 Jun 19, 2024

ggainey Jun 20, 2024

ggainey Jun 20, 2024

ggainey Jun 20, 2024 •

edited

Loading

quba42 Jun 21, 2024

dralley Jun 20, 2024

dralley Jun 20, 2024

patchback bot commented Jun 20, 2024 •

edited

Loading

patchback bot commented Jun 20, 2024 •

edited

Loading

Allow core/3.55+. #3621

Allow core/3.55+. #3621

Conversation

ggainey commented Jun 18, 2024

ggainey commented Jun 18, 2024

ggainey commented Jun 18, 2024

quba42 Jun 19, 2024

Choose a reason for hiding this comment

quba42 Jun 19, 2024

Choose a reason for hiding this comment

ggainey Jun 20, 2024

Choose a reason for hiding this comment

ggainey Jun 20, 2024

Choose a reason for hiding this comment

ggainey Jun 20, 2024 • edited Loading

Choose a reason for hiding this comment

quba42 Jun 21, 2024

Choose a reason for hiding this comment

dralley Jun 20, 2024

Choose a reason for hiding this comment

dralley Jun 20, 2024

Choose a reason for hiding this comment

patchback bot commented Jun 20, 2024 • edited Loading

Backport to 3.27: 💚 backport PR created

patchback bot commented Jun 20, 2024 • edited Loading

Backport to 3.26: 💔 cherry-picking failed — conflicts found

Backporting merged PR #3621 into main

ggainey Jun 20, 2024 •

edited

Loading

patchback bot commented Jun 20, 2024 •

edited

Loading

patchback bot commented Jun 20, 2024 •

edited

Loading