-
-
Notifications
You must be signed in to change notification settings - Fork 7k
Updated tox/travis to point to Django main
branch.
#7827
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
Conversation
|
7d150bd
to
0a9ea65
Compare
main
branch.main
branch.
rest_framework/pagination.py
Outdated
# paginator needed in get_page_number() | ||
# Regression in 6f6d402d04 and/or c05cbe2da213/ | ||
self.paginator = paginator |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @tomchristie
There's a regression in in 6f6d402 and/or c05cbe2 — See Travis error
I've just put this here to see what the CI says (since I'm trying to update for the s/master/main/ on Django) but we'll need to pull this out and fix it properly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. Don't think there has ever been a point in history where a change has been applied without a PR that hasn't quietly broken things. Still, sorted now... 39a98c8
Still looks like there's a failing test on tests/test_description.py:170: in test_markdown
that's non-obvious to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's drop the self.paginator = ...
changes in the PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still looks like there's a failing test on tests/test_description.py:170: in test_markdown that's non-obvious to me.
Did you pip install -U markdown
?
Will rebase now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gotcha, that sorted it.
c49e86b
to
6e46dde
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fantastique
django/django renamed development branch to
main
.