This repository was archived by the owner on Jun 8, 2026. It is now read-only.
fix: Replace, fast-forward Django CI branch - #598
Merged
c24t merged 2 commits intoFeb 4, 2021
Merged
c24t merged 2 commits into
c24t merged 2 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
c24t
force-pushed
the
ci-django-branch
branch
from
869ec88 to
bfdf38b
Compare
February 2, 2021 23:25
c24t
marked this pull request as ready for review
February 2, 2021 23:59
This was referenced Apr 17, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Addresses googleapis/google-cloud-python#15951.
This PR replaces the version of django used in CI tests. It replaces https://github.com/timgraham/django/tree/spanner-2.2.x with https://github.com/c24t/django/tree/spanner/stable/2.2.x. We'll keep this new branch up to date with the stable/2.2.x django branch.
The new branch has all of @timgraham's django patches, just fast-forwarded to pick up recent changes in stable/2.2.x. You can see the full list of those changes with git rev-list 3ab5235d1d..34010d8ffa.
For the full list of @timgraham's django patches, see git rev-list 120fdc3e42..0d551deb67 or the equivalent diff preview on GH.