======================================================================
ERROR: test_migrate (model_utils.tests.tests.MigrationsTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/user/projects/django-model-utils/model_utils/tests/tests.py", line 42, in test_migrate
call_command('migrate', fake=True)
File "/home/user/projects/django-model-utils/.tox/py27-trunk/local/lib/python2.7/site-packages/django/core/management/__init__.py", line 167, in call_command
return klass.execute(*args, **defaults)
File "/home/user/projects/django-model-utils/.tox/py27-trunk/local/lib/python2.7/site-packages/django/core/management/base.py", line 337, in execute
output = self.handle(*args, **options)
File "/home/user/projects/django-model-utils/.tox/py27-trunk/local/lib/python2.7/site-packages/django/core/management/commands/migrate.py", line 138, in handle
ProjectState.from_apps(apps),
File "/home/user/projects/django-model-utils/.tox/py27-trunk/local/lib/python2.7/site-packages/django/db/migrations/state.py", line 71, in from_apps
model_state = ModelState.from_model(model)
File "/home/user/projects/django-model-utils/.tox/py27-trunk/local/lib/python2.7/site-packages/django/db/migrations/state.py", line 136, in from_model
e,
TypeError: Couldn't reconstruct field name_changed on tests.Monitored: MonitorField requires a "monitor" argument
* master: (23 commits)
only accepting iterables to the when field
adding 'when' parameter to MonitorField
Update AUTHORS and changelog.
Add test to verify get_subclass() on QuerySet
Refactor to make sure get_subclass() is on QuerySet
Fixed indexing into Choices so its useful.
Fix bug with child/grandchild select_subclasses in Django 1.6+; thanks Keryn Knight.
fixed code block
Bump version for dev.
Bump version for 1.5.0 release.
Add option-groups capability to Choices.
Add Changelog note about Choices equality/addition.
Added tests to improve coverage
Alphabetised authors
Removed redundant inequality method on Choices
Moved documentation for Choices field to the right place
Corrected typo
Added self to Authors file
Added equality methods to Choices objects, and overrode + for Choices for easy concatenation with other Choices and choice-like iterables. Also wrote tests for them, and extended the readme to reflect this
Fix typo noted by @silonov
...
Conflicts:
model_utils/choices.py
* master:
Remove misinformation from changelog; oops.
Tweak AUTHORS and changelog.
PassThroughManager calls superclass `get_query_set`.
Update AUTHORS and changelog.
Fix tox.ini so runtests.sh works.
Test and fix for second grandchild bug.
