lp:charms/python-django

Branch merges

Propose for merging

3 branches proposed for merging into this one.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

40. By Charles Butler on 2015-06-16

    [r,a=lazypower] Tim Penhey 2015-06-06 Fix the django 1.8 with postgresql test.
    Tim Penhey 2015-06-05 Tweak makefile and test calls.
    Tim Penhey 2015-06-05 Make the django test executable.
    Tim Penhey 2015-06-05 Make the lint target depend on flake8 in the virtual env.
    Tim Penhey 2015-06-04 Make sure to use --noinput for Django 1.7+ migrate.
    Tim Penhey 2015-06-04 Must update pip during upgrade too.
    Tim Penhey 2015-06-04 make check uses virtual env.
    Tim Penhey 2015-05-31 Attempting to get bundletest working properly, adding 1.8 test.
    Tim Penhey 2015-05-29 mock out admin location
    Tim Penhey 2015-05-28 [merge] Merge prev
    Tim Penhey 2015-05-25 lint fixes
    Tim Penhey 2015-05-24 Mock out the log function too.
    Tim Penhey 2015-05-24 Yet more fixes.
    Tim Penhey 2015-05-23 Fixes found testing deployment.
    Tim Penhey 2015-05-23 Add the update pip thing.
    Tim Penhey 2015-05-23 Fix the config names.
    Tim Penhey 2015-05-23 added tests, check make target
    Tim Penhey 2015-05-23 Removed charmhelpers/contrib, not used.
    Tim Penhey 2015-05-23 test_template.py was a copy from gunicorn and didn't work
    Tim Penhey 2015-05-23 No lint.
    Tim Penhey 2015-05-23 Fix lint and semantic_version import.
    Tim Penhey 2015-05-23 [merge] Merge trunk.

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

Bug #1462597: Does not support Django 1.7+

39. By Tim Van Steenburgh on 2015-06-12

[thumper] Remove charmhelpers.contrib (not used)

Merged branch lp:~thumper/charms/trusty/python-django/clean-contrib

38. By Charles Butler on 2015-05-22

  [r,a=lazypower] Tim Penhey 2015-05-22 Run migrate if django is modern enough
  Tim Penhey 2015-05-22 fix sanitized_unit_name rename, as it isn't the unit name

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

Bug #1462597: Does not support Django 1.7+

37. By Marco Ceppi on 2015-04-22

[nicopace] correcting allowed_hosts

Merged branch lp:~nicopace/charms/trusty/python-django/allowed_host_patch

36. By Tim Van Steenburgh on 2015-04-06

[codersquid] Fix tests

Install tests deps
Fix branch in test config

Merged branch lp:~codersquid/charms/precise/python-django/fix-test-branches

35. By Marco Ceppi on 2015-02-11

[thumper] Extract out a method for the database sync calls.

Merged branch lp:~thumper/charms/precise/python-django/tweaks

34. By Marco Ceppi on 2015-01-07

[patrick-hetu] This makes the charm usable (on precise and trusty) until the Ansible version is ready.

Merged branch lp:~patrick-hetu/charms/precise/python-django/pure-python

33. By Charles Butler on 2014-10-31

Rename categories to tags

32. By Charles Butler on 2014-10-31

Adds amulet standup test, and chmod -x the existing test as they dont run properly. Leaving in-tact for reference to update later

31. By Charles Butler on 2014-10-31

Updates config.yaml with default keys to pass proof