Skip to content
This repository was archived by the owner on Mar 15, 2018. It is now read-only.

Port to Django 1.6#1769

Closed
washort wants to merge 1 commit into
mozilla:masterfrom
washort:django16
Closed

Port to Django 1.6#1769
washort wants to merge 1 commit into
mozilla:masterfrom
washort:django16

Conversation

@washort

@washort washort commented Feb 15, 2014

Copy link
Copy Markdown
Contributor

These are the last few changes needed for Django 1.6 compatibility.
PRs for dependencies:
jbalogh/test-utils#25
mozilla/nuggets#4

Comment thread requirements/prod.txt Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

For every requirement you had to fork, we need to push for a new release with your fixes. Let's try to avoid keeping forks around.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

links for dependency PRs added.

@diox

diox commented Feb 15, 2014

Copy link
Copy Markdown
Member

So, I realize this is going to be annoying, but I think we need to split this PR up. I'd like to have at least the version-related changes and the fixtures changes in separate PRs to make it easier to review and spot regressions.

The most backwards-compatible changes we can merge before the actual switch to 1.6, the better.

@washort

washort commented Feb 15, 2014

Copy link
Copy Markdown
Contributor Author

I agree that splitting things up is better. I'll see what I can do.

@washort

washort commented Feb 18, 2014

Copy link
Copy Markdown
Contributor Author

preliminary changes moved to #1774

@washort

washort commented Feb 18, 2014

Copy link
Copy Markdown
Contributor Author

preliminary changes merged.

Comment thread apps/addons/tests/test_models.py Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This shouldn't be necessary with the removal of the version magic, or something is wrong.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Something must be wrong then, because removing this causes get_localepicker to fail.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Even if you self.addon.reload() ?

Edit:* It could be because the File we create has the wrong status actually.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

reload() works here without that update. Oops, no it doesn't. I'll have a look at the file status.

@diox

diox commented Feb 25, 2014

Copy link
Copy Markdown
Member

r+wc from me if tests pass after rebasing against master :)

@washort

washort commented Feb 26, 2014

Copy link
Copy Markdown
Contributor Author

well I merged this and now both CI and -dev deploy are broken with no meaningful errors. reverting until I can get ops help.

This reverts commit 62d75b2.
@washort washort closed this Mar 27, 2014
@washort washort deleted the django16 branch March 27, 2014 18:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants