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

Update pulp-glue requirement from <0.31,>=0.18.0 to >=0.18.0,<0.32 #6302

Merged
merged 1 commit into from
Feb 25, 2025

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Feb 25, 2025

Updates the requirements on pulp-glue to permit the latest version.

Changelog

Sourced from pulp-glue's changelog.

0.31.0 (2025-02-25) {: #0.31.0 }

Bugfixes {: #0.31.0-bugfix }

  • Added "--base-repository" option to modify commands to allow creating a repository version from a different repository. #618

Misc {: #0.31.0-misc }

  • Changed the upper version bound of packaging to the last available version according to CalVer. #1125

Pulp GLUE {: #0.31.0-pulp-glue }

Features {: #0.31.0-pulp-glue-feature }

  • Improved validation to consume openapi 3.1 schemata also.

Bugfixes {: #0.31.0-pulp-glue-bugfix }

  • Fixed validation failure with additionalProperties.

Misc {: #0.31.0-pulp-glue-misc }

  • Changed the upper version bound of packaging to the last available version according to CalVer. #1125

0.30.2 (2025-01-20) {: #0.30.2 }

No significant changes.

Pulp GLUE {: #0.30.2-pulp-glue }

No significant changes.

... (truncated)

Commits
  • 012d126 Release 0.31.0
  • 1702bd0 Use RELEASE_TOKEN in checkout
  • 80726a8 Use RELEASE_TOKEN to create release branch
  • a209cb3 Adapt schema validation to openapi 3.1
  • dc0ff02 Update cookiecutter
  • ddd7fbb Allow to specify base repository for modify
  • b4da9a3 Adjust cookiecutter
  • 466e3f4 Fixed validation with additionalProperties
  • 39cf9bf Adjust positional only arguments for new mypy
  • 2e5b308 [PIP] Bump mypy from 1.14.1 to 1.15.0
  • Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Updates the requirements on [pulp-glue](https://github.com/pulp/pulp-cli) to permit the latest version.
- [Changelog](https://github.com/pulp/pulp-cli/blob/0.31.0/CHANGES.md)
- [Commits](pulp/pulp-cli@0.18.0...0.31.0)

---
updated-dependencies:
- dependency-name: pulp-glue
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added the Dependencies Pull requests that update a dependency file label Feb 25, 2025
@ggainey ggainey merged commit ecd705c into main Feb 25, 2025
12 checks passed
@ggainey ggainey deleted the dependabot/pip/pulp-glue-gte-0.18.0-and-lt-0.32 branch February 25, 2025 21:33
Copy link

patchback bot commented Feb 28, 2025

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

❌ Failed to cleanly apply ecd705c on top of patchback/backports/3.63/ecd705c31be2f1d3c17cc7d819251dc3bd6d55fb/pr-6302

Backporting merged PR #6302 into main

  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/pulpcore.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/3.63/ecd705c31be2f1d3c17cc7d819251dc3bd6d55fb/pr-6302 upstream/3.63
  4. Now, cherry-pick PR Update pulp-glue requirement from <0.31,>=0.18.0 to >=0.18.0,<0.32 #6302 contents into that branch:
    $ git cherry-pick -x ecd705c31be2f1d3c17cc7d819251dc3bd6d55fb
    If it'll yell at you with something like fatal: Commit ecd705c31be2f1d3c17cc7d819251dc3bd6d55fb is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ecd705c31be2f1d3c17cc7d819251dc3bd6d55fb
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Update pulp-glue requirement from <0.31,>=0.18.0 to >=0.18.0,<0.32 #6302 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.63/ecd705c31be2f1d3c17cc7d819251dc3bd6d55fb/pr-6302
  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
Labels
backport-3.63 Dependencies Pull requests that update a dependency file no-changelog no-issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant