Migration to django-popolo part 1#1193
Migration to django-popolo part 1#1193mhl merged 5 commits intoreviewed-migrate-to-django-popolofrom
Conversation
mhl
changed the title
chrismytton
left a comment
chrismytton
left a comment
There was a problem hiding this comment.
Even after removing the popolo_source = models.ForeignKey(PopoloSource, null=True, blank=True) line I'm still getting some errors when running the tests, is that related to the two lines that call PopoloPerson.objects?
| ) | ||
| writeitinstance = models.ForeignKey(WriteItInstance) | ||
| popitapiinstance = models.ForeignKey(ApiInstance) | ||
| popolo_source = models.ForeignKey(PopoloSource, null=True, blank=True) |
There was a problem hiding this comment.
I'm getting an error on this line when I run the tests:
(writeit-virtualenv)vagrant@precise64:/vagrant$ ./manage.py test nuntium contactos mailit
Traceback (most recent call last):
File "./manage.py", line 10, in <module>
execute_from_command_line(sys.argv)
File "/home/vagrant/writeit-virtualenv/local/lib/python2.7/site-packages/django/core/management/__init__.py", line 385, in execute_from_command_line
utility.execute()
File "/home/vagrant/writeit-virtualenv/local/lib/python2.7/site-packages/django/core/management/__init__.py", line 354, in execute
django.setup()
File "/home/vagrant/writeit-virtualenv/local/lib/python2.7/site-packages/django/__init__.py", line 21, in setup
apps.populate(settings.INSTALLED_APPS)
File "/home/vagrant/writeit-virtualenv/local/lib/python2.7/site-packages/django/apps/registry.py", line 108, in populate
app_config.import_models(all_models)
File "/home/vagrant/writeit-virtualenv/local/lib/python2.7/site-packages/django/apps/config.py", line 202, in import_models
self.models_module = import_module(models_module_name)
File "/usr/lib/python2.7/importlib/__init__.py", line 37, in import_module
__import__(name)
File "/vagrant/instance/models.py", line 149, in <module>
class WriteitInstancePopitInstanceRecord(models.Model):
File "/vagrant/instance/models.py", line 159, in WriteitInstancePopitInstanceRecord
popolo_source = models.ForeignKey(PopoloSource, null=True, blank=True)
NameError: name 'PopoloSource' is not defined
I'm guessing this line has snuck into this pull request unintentionally? :)
There was a problem hiding this comment.
In fact it's just missing the import - we need this foreign key to be there for the datamigration which will populate it with the equivalent PopoloSource to the old ApiInstance. I've pushed a fixup for this and the other accidental s/Person/PopoloPerson/ changes that you mentioned.
instance/models.py
Outdated
| self.do_something_with_a_vanished_popit_api_instance(popit_api_instance) | ||
| return (False, e) | ||
| persons = Person.objects.filter(api_instance=popit_api_instance) | ||
| persons = PopoloPerson.objects.filter(api_instance=popit_api_instance) |
There was a problem hiding this comment.
It seems like this line should probably not be changed until after the data has been migrated in the later commits?
There was a problem hiding this comment.
Yes, sorry, that should be in a later PR.
nuntium/models.py
Outdated
| @property | ||
| def people(self): | ||
| people = Person.objects.filter( | ||
| people = PopoloPerson.objects.filter( |
There was a problem hiding this comment.
Same with this line, I think this should probably only be changed once the data has been migrated in later commits?
mhl
force-pushed
the
migrate-to-django-popolo-part-1
branch
from
8088b5b to
bc4d6c6
Compare
3 participants
This is the first part of: #1181 for review. See that pull request for the context for this pull request.
It adds django-popolo models in parallel with the popit-django models that we're intending to replace.