8000 Updated tox/travis to point to Django `main` branch. by carltongibson · Pull Request #7827 · encode/django-rest-framework · GitHub
[go: up one dir, main page]

Skip to content

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

Merged
merged 1 commit into from
Mar 11, 2021

Conversation

carltongibson
Copy link
Collaborator

django/django renamed development branch to main.

@carltongibson
Copy link
Collaborator Author
carltongibson commented Mar 10, 2021

Need to do travis too... 18848a1

@carltongibson carltongibson changed the title Updated tox to point to Django main branch. Updated tox/travis to point to Django main branch. Mar 10, 2021
Comment on lines 202 to 204
# paginator needed in get_page_number()
# Regression in 6f6d402d04 and/or c05cbe2da213/
self.paginator = paginator
Copy link
Collaborator Author
@carltongibson carltongibson Mar 10, 2021

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 c05cbe2See 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.

Copy link
Member

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.

Copy link
Member

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.

Copy link
Collaborator Author

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, that sorted it.

Copy link
Member
@tomchristie tomchristie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fantastique

@tomchristie tomchristie merged commit f070619 into master Mar 11, 2021
@tomchristie tomchristie deleted the update-to-main branch March 11, 2021 10:26
stefanacin pushed a commit to stefanacin/django-rest-framework that referenced this pull request Mar 22, 2021
sigvef pushed a commit to sigvef/django-rest-framework that referenced this pull request Dec 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0