lp:~thumper/charms/trusty/python-django/support-1.7

Branch merges

Propose for merging

1 branch dependent on this one.

Merged into lp:charms/python-django at revision 40

Charles Butler (community): Approve on 2015-06-16

Whit Morriss (community): Needs Fixing on 2015-05-29

Tim Van Steenburgh: Pending requested 2015-05-27

Diff: 1473 lines (+686/-471)

11 files modified

.bzrignore (+1/-0)
Makefile (+22/-6)
hooks/hooks.py (+442/-333)
hooks/tests/test_template.py (+0/-125)
hooks/tests/test_unit.py (+128/-0)
templates/pgsql_engine.tmpl (+1/-1)
tests/10-mysql (+2/-3)
tests/10-postgresql (+2/-3)
tests/11-django-1.8-with-postgresql (+57/-0)
tests/config/django.yaml (+21/-0)
tests/tests.yaml (+10/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1462597: Does not support Django 1.7+

Undecided

In Progress

Link a bug report

Related blueprints

61. By Tim Penhey on 2015-06-06

Fix the django 1.8 with postgresql test.
Seems that the autocommit option being used was removed in Django 1.8.

60. By Tim Penhey on 2015-06-05

Tweak makefile and test calls.

59. By Tim Penhey on 2015-06-05

Make the django test executable.

58. By Tim Penhey on 2015-06-05

Make the lint target depend on flake8 in the virtual env.

57. By Tim Penhey on 2015-06-04

Make sure to use --noinput for Django 1.7+ migrate.

56. By Tim Penhey on 2015-06-04

Must update pip during upgrade too.

55. By Tim Penhey on 2015-06-04

make check uses virtual env.

54. By Tim Penhey on 2015-05-31

Attempting to get bundletest working properly, adding 1.8 test.

53. By Tim Penhey on 2015-05-29

mock out admin location

52. By Tim Penhey on 2015-05-27

Merge prev