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

Add stricter upperbound for galaxy-importer to account for dropping of py3.8 #2084

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

gerrod3
Copy link
Contributor

@gerrod3 gerrod3 commented Jan 15, 2025

Our older images <core3.49 use python3.8. A recent release of galaxy-importer now uses code not present in py3.8, and it seems they haven't been testing 3.8 for a while. So restrict to last known supported version: ansible/galaxy-importer@109c1ee

@mdellweg mdellweg merged commit 2e4d129 into pulp:0.20 Jan 15, 2025
12 checks passed
Copy link

patchback bot commented Jan 15, 2025

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

❌ Failed to cleanly apply 2e4d129 on top of patchback/backports/0.16/2e4d1296644193213b8bf36f5cce54f6cb3e2c31/pr-2084

Backporting merged PR #2084 into 0.20

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. 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_ansible.git
  3. 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/0.16/2e4d1296644193213b8bf36f5cce54f6cb3e2c31/pr-2084 upstream/0.16
  4. Now, cherry-pick PR Add stricter upperbound for galaxy-importer to account for dropping of py3.8 #2084 contents into that branch:
    $ git cherry-pick -x 2e4d1296644193213b8bf36f5cce54f6cb3e2c31
    If it'll yell at you with something like fatal: Commit 2e4d1296644193213b8bf36f5cce54f6cb3e2c31 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 2e4d1296644193213b8bf36f5cce54f6cb3e2c31
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add stricter upperbound for galaxy-importer to account for dropping of py3.8 #2084 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/0.16/2e4d1296644193213b8bf36f5cce54f6cb3e2c31/pr-2084
  7. 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.

@mdellweg
Copy link
Member

#2085

@gerrod3 gerrod3 deleted the restrain-galaxy-imp branch January 15, 2025 14:19
Copy link

patchback bot commented Jan 20, 2025

Backport to 0.18: 💚 backport PR created

✅ Backport PR branch: patchback/backports/0.18/2e4d1296644193213b8bf36f5cce54f6cb3e2c31/pr-2084

Backported as #2096

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

Copy link

patchback bot commented Jan 20, 2025

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

❌ Failed to cleanly apply 2e4d129 on top of patchback/backports/0.15/2e4d1296644193213b8bf36f5cce54f6cb3e2c31/pr-2084

Backporting merged PR #2084 into 0.20

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. 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_ansible.git
  3. 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/0.15/2e4d1296644193213b8bf36f5cce54f6cb3e2c31/pr-2084 upstream/0.15
  4. Now, cherry-pick PR Add stricter upperbound for galaxy-importer to account for dropping of py3.8 #2084 contents into that branch:
    $ git cherry-pick -x 2e4d1296644193213b8bf36f5cce54f6cb3e2c31
    If it'll yell at you with something like fatal: Commit 2e4d1296644193213b8bf36f5cce54f6cb3e2c31 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 2e4d1296644193213b8bf36f5cce54f6cb3e2c31
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add stricter upperbound for galaxy-importer to account for dropping of py3.8 #2084 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/0.15/2e4d1296644193213b8bf36f5cce54f6cb3e2c31/pr-2084
  7. 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.

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