Upgrade playdoh-lib to latest master with Django 1.5 #1764

Merged
merged 1 commit into from Mar 12, 2014

Conversation

Projects
None yet
4 participants
Member

pmclanahan commented Mar 7, 2014

Upgrades a number of things:

  • 83cee01 Merge pull request #59 from peterbe/upgrade-test_utils
  • 57c1b29 upgrade test_utils
  • ce50051 Merge pull request #58 from glogiotatidis/master
  • 19e16ab Upgrade test-utils to support Django 1.5.
  • ee0b875 Merge pull request #57 from pmclanahan/upgrade-django-nose
  • b5273fe Upgrade django-nose
  • 1117ecc Merge pull request #56 from willkg/update-funfactory
  • 6bc7ee1 Update funfactory to latest master tip
  • f4936a8 Update jingo to latest master tip (5e985a5)
  • 892ed74 Update to Django 1.5.5
  • 2c89fe7 Upgrade bleach to 1.2.2
  • db88c21 Django 1.4.10, r=willkg
  • 94dcac7 Merge pull request #53 from willkg/remove-schematic-2
  • c66e513 Remove schematic submodule
  • 2ad6d1e Merge pull request #50 from willkg/sort-vendorpth
  • 16d21ce Cosmetic: Resort vendor.pth
  • 707fdfc updating django-mobility and django-multidb-router
  • 4d482c3 Merge pull request #49 from akatsoulas/update-funfactory
  • 730f35d Update funfactory to latest master.
  • 65d7a52 upgrade to django-browserid 0.9
  • a1def31 Merge pull request #47 from pmclanahan/update-funfactory
  • 9b22ad9 Update funfactory to latest master.

Also removes reliance on deprecated things:

  • django.conf.urls.defaults
  • verify_exists kwarg on UrlField

@jgmize and/or @Osmose r?

Member

pmclanahan commented Mar 7, 2014

@alexgibson This will break the thing we did today for the win8 stuff. I'm sure your PR #1759 will merge before this one. I'll fix it when it does. Just please let me know when that happens.

What changed? Django 1.5 changes generic class-based-view TemplateView so that it just adds things in the URL config directly to the context instead of to the params context.

Member

alexgibson commented Mar 10, 2014

@alexgibson This will break the thing we did today for the win8 stuff. I'm sure your PR #1759 will merge before this one. I'll fix it when it does. Just please let me know when that happens.

Thanks for the heads up, will comment here should #1759 merge first. Thanks!

Owner

Osmose commented Mar 10, 2014

Code looks fine, tests pass, site runs locally without issues, changes are pretty safe IMO.

r+!

Fix bug 946880: Upgrade playdoh-lib to latest master with Django 1.5
Upgrades a number of things:

* 83cee01 Merge pull request #59 from peterbe/upgrade-test_utils
* 57c1b29 upgrade test_utils
* ce50051 Merge pull request #58 from glogiotatidis/master
* 19e16ab Upgrade test-utils to support Django 1.5.
* ee0b875 Merge pull request #57 from pmclanahan/upgrade-django-nose
* b5273fe Upgrade django-nose
* 1117ecc Merge pull request #56 from willkg/update-funfactory
* 6bc7ee1 Update funfactory to latest master tip
* f4936a8 Update jingo to latest master tip (5e985a5)
* 892ed74 Update to Django 1.5.5
* 2c89fe7 Upgrade bleach to 1.2.2
* db88c21 Django 1.4.10, r=willkg
* 94dcac7 Merge pull request #53 from willkg/remove-schematic-2
* c66e513 Remove schematic submodule
* 2ad6d1e Merge pull request #50 from willkg/sort-vendorpth
* 16d21ce Cosmetic: Resort vendor.pth
* 707fdfc updating django-mobility and django-multidb-router
* 4d482c3 Merge pull request #49 from akatsoulas/update-funfactory
* 730f35d Update funfactory to latest master.
* 65d7a52 upgrade to django-browserid 0.9
* a1def31 Merge pull request #47 from pmclanahan/update-funfactory
* 9b22ad9 Update funfactory to latest master.

Also removes reliance on deprecated things:

* django.conf.urls.defaults
* verify_exists kwarg on UrlField

pmclanahan pushed a commit that referenced this pull request Mar 12, 2014

Merge pull request #1764 from pmclanahan/upgrade-playdoh-lib-django-1.5
Fix bug 946880: Upgrade playdoh-lib to latest master with Django 1.5

@pmclanahan pmclanahan merged commit 06c0b1f into mozilla:master Mar 12, 2014

1 check passed

default Jenkins build 'bedrock_github' #3458 has succeeded
Details

@pmclanahan pmclanahan deleted the pmclanahan:upgrade-playdoh-lib-django-1.5 branch Mar 12, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment