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

[noissue]: Update djangorestframework requirement from <=3.15.0,>=3.14.0 to >=3.14.0,<=3.15.1 #5150

Merged

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 22, 2024

Updates the requirements on djangorestframework to permit the latest version.

Commits
  • 3285916 Version 3.15.1 (#9339)
  • eb361d2 SearchFilter.get_search_terms returns list. (#9338)
  • 400b4c5 Revert "Fix NamespaceVersioning ignoring DEFAULT_VERSION on non-None namespac...
  • 4ef3aaf Revert #9030 (#9333)
  • 4f10c4e Revert "Fix Respect can_read_model permission in DjangoModelPermissions (#8...
  • a4d5807 Revert "feat: Add some changes to ValidationError to support django style vad...
  • da78a14 Revert "Re-prefetch related objects after updating (#8043)" (#9327)
  • 0e4ed81 Revert "feat: Add some changes to ValidationError to support django style vad...
  • 56a5b35 Add drf-sendables to third-party-packages.md (#9261)
  • d7c8dcf Revert PR that adds autocomplete_fields to TokenAdmin, as this break some use...
  • 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 [djangorestframework](https://github.com/encode/django-rest-framework) to permit the latest version.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](encode/django-rest-framework@3.14.0...3.15.1)

---
updated-dependencies:
- dependency-name: djangorestframework
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added the Dependencies Pull requests that update a dependency file label Mar 22, 2024
@ggainey ggainey merged commit 098b590 into main Mar 26, 2024
16 checks passed
@ggainey ggainey deleted the dependabot/pip/djangorestframework-gte-3.14.0-and-lte-3.15.1 branch March 26, 2024 16:34
Copy link

patchback bot commented Apr 25, 2024

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

❌ Failed to cleanly apply 098b590 on top of patchback/backports/3.49/098b59069de96c4bf04be7535acb3723383e0a29/pr-5150

Backporting merged PR #5150 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.49/098b59069de96c4bf04be7535acb3723383e0a29/pr-5150 upstream/3.49
  4. Now, cherry-pick PR [noissue]: Update djangorestframework requirement from <=3.15.0,>=3.14.0 to >=3.14.0,<=3.15.1 #5150 contents into that branch:
    $ git cherry-pick -x 098b59069de96c4bf04be7535acb3723383e0a29
    If it'll yell at you with something like fatal: Commit 098b59069de96c4bf04be7535acb3723383e0a29 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 098b59069de96c4bf04be7535acb3723383e0a29
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [noissue]: Update djangorestframework requirement from <=3.15.0,>=3.14.0 to >=3.14.0,<=3.15.1 #5150 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.49/098b59069de96c4bf04be7535acb3723383e0a29/pr-5150
  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.49 Dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants