Bring the factory-boy and Faker dependencies forward through some minor breaking changes. Stop using the deprecated fr_QC locale in Faker. Commit ready for merge.

 - Legacy-Id: 19270

Author: rjsparks

ietf/dbtemplate/factories.py

@@ -2,7 +2,7 @@
 
 from ietf.dbtemplate.models import DBTemplate
 
-class DBTemplateFactory(factory.DjangoModelFactory):
+class DBTemplateFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = DBTemplate
 

ietf/doc/factories.py

@@ -29,7 +29,7 @@ def draft_name_generator(type_id,group,n):
               n,
             )
 
-class BaseDocumentFactory(factory.DjangoModelFactory):
+class BaseDocumentFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Document
 
@@ -259,7 +259,7 @@ class ReviewFactory(BaseDocumentFactory):
     name = factory.LazyAttribute(lambda o: 'review-doesnotexist-00-%s-%s'%(o.group.acronym,datetime.date.today().isoformat()))
     group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='review')
 
-class DocAliasFactory(factory.DjangoModelFactory):
+class DocAliasFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = DocAlias
 
@@ -276,7 +276,7 @@ def docs(self, create, extracted, **kwargs):
                     self.docs.add(doc)
 
 
-class DocEventFactory(factory.DjangoModelFactory):
+class DocEventFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = DocEvent
 
@@ -326,7 +326,7 @@ def state(obj, create, extracted, **kwargs):
         obj.save()
 
 # All of these Ballot* factories are extremely skeletal. Flesh them out as needed by tests.
-class BallotTypeFactory(factory.DjangoModelFactory):
+class BallotTypeFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = BallotType
         django_get_or_create = ('slug','doc_type_id')
@@ -363,14 +363,14 @@ class Meta:
     balloter = factory.SubFactory('ietf.person.factories.PersonFactory')
     pos_id = 'discuss'
 
-class DocumentActionHolderFactory(factory.DjangoModelFactory):
+class DocumentActionHolderFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = DocumentActionHolder
 
     document = factory.SubFactory(WgDraftFactory)
     person = factory.SubFactory('ietf.person.factories.PersonFactory')
 
-class DocumentAuthorFactory(factory.DjangoModelFactory):
+class DocumentAuthorFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = DocumentAuthor
 

ietf/group/factories.py

@@ -9,7 +9,7 @@
                               GroupHistory, RoleHistory
 from ietf.review.factories import ReviewTeamSettingsFactory
 
-class GroupFactory(factory.DjangoModelFactory):
+class GroupFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Group
         django_get_or_create = ('acronym',)
@@ -39,15 +39,15 @@ class ReviewTeamFactory(GroupFactory):
     def settings(obj, create, extracted, **kwargs):
         ReviewTeamSettingsFactory.create(group=obj,**kwargs)
 
-class RoleFactory(factory.DjangoModelFactory):
+class RoleFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Role
 
     group = factory.SubFactory(GroupFactory)
     person = factory.SubFactory('ietf.person.factories.PersonFactory')
     email = factory.LazyAttribute(lambda obj: obj.person.email())
 
-class GroupEventFactory(factory.DjangoModelFactory):
+class GroupEventFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = GroupEvent
 
@@ -56,7 +56,7 @@ class Meta:
     type = 'comment'
     desc = factory.Faker('paragraph')
 
-class BaseGroupMilestoneFactory(factory.DjangoModelFactory):
+class BaseGroupMilestoneFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = GroupMilestone
 
@@ -72,7 +72,7 @@ class DatelessGroupMilestoneFactory(BaseGroupMilestoneFactory):
     group = factory.SubFactory(GroupFactory, uses_milestone_dates=False)
     order = factory.Sequence(lambda n: n)
 
-class GroupHistoryFactory(factory.DjangoModelFactory):
+class GroupHistoryFactory(factory.django.DjangoModelFactory):
     class Meta:
         model=GroupHistory
 
@@ -86,7 +86,7 @@ class Meta:
     group = factory.SubFactory(GroupFactory)
     acronym = factory.LazyAttribute(lambda obj: obj.group.acronym)
 
-class RoleHistoryFactory(factory.DjangoModelFactory):
+class RoleHistoryFactory(factory.django.DjangoModelFactory):
     class Meta:
         model=RoleHistory
 

ietf/iesg/factories.py

@@ -7,7 +7,7 @@
 from ietf.iesg.models import TelechatAgendaItem
 
 
-class IESGMgmtItemFactory(factory.DjangoModelFactory):
+class IESGMgmtItemFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = TelechatAgendaItem
 

ietf/ietfauth/factories.py

@@ -11,7 +11,7 @@
 
 from ietf.person.factories import UserFactory, PersonFactory
 
-class OidClientRecordFactory(factory.DjangoModelFactory):
+class OidClientRecordFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = OidClientRecord
 

ietf/ipr/factories.py

@@ -14,13 +14,13 @@
 def _fake_patent_info():
     return "Date: %s\nNotes: %s\nTitle: %s\nNumber: %s\nInventor: %s\n" % (
         (datetime.datetime.today()-datetime.timedelta(days=365)).strftime("%Y-%m-%d"),
-        factory.Faker('paragraph').generate({}),
-        factory.Faker('sentence', nb_words=8).generate({}),
+        factory.Faker('paragraph'),
+        factory.Faker('sentence', nb_words=8),
         'US9999999',
-        factory.Faker('name').generate({}),
+        factory.Faker('name'),
     )
 
-class IprDisclosureBaseFactory(factory.DjangoModelFactory):
+class IprDisclosureBaseFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = IprDisclosureBase
 
@@ -83,7 +83,7 @@ class Meta:
     holder_contact_email = factory.Faker('email')
     holder_contact_name = factory.Faker('name')
 
-class IprEventFactory(factory.DjangoModelFactory):
+class IprEventFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = IprEvent
 

ietf/liaisons/factories.py

@@ -3,7 +3,7 @@
 from ietf.group.factories import GroupFactory
 from ietf.liaisons.models import LiaisonStatement, LiaisonStatementEvent, LiaisonStatementAttachment
 
-class LiaisonStatementFactory(factory.DjangoModelFactory):
+class LiaisonStatementFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = LiaisonStatement
 
@@ -30,7 +30,7 @@ def to_groups(obj, create, extracted, **kwargs):
                 obj.to_groups.add(GroupFactory(type_id='wg'))
 
 
-class LiaisonStatementEventFactory(factory.DjangoModelFactory):
+class LiaisonStatementEventFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = LiaisonStatementEvent
 
@@ -40,7 +40,7 @@ class Meta:
     desc = factory.Faker('sentence')
 
 
-class LiaisonStatementAttachmentFactory(factory.DjangoModelFactory):
+class LiaisonStatementAttachmentFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = LiaisonStatementAttachment
 

ietf/mailinglists/factories.py

@@ -7,7 +7,7 @@
 
 from ietf.mailinglists.models import List
 
-class ListFactory(factory.DjangoModelFactory):
+class ListFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = List
 

ietf/meeting/factories.py

@@ -13,7 +13,7 @@
 from ietf.group.factories import GroupFactory
 from ietf.person.factories import PersonFactory
 
-class MeetingFactory(factory.DjangoModelFactory):
+class MeetingFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Meeting
 
@@ -75,7 +75,7 @@ def populate_schedule(obj, create, extracted, **kwargs): # pylint: disable=no-se
             obj.schedule = ScheduleFactory(meeting=obj)
             obj.save()
 
-class SessionFactory(factory.DjangoModelFactory):
+class SessionFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Session
 
@@ -116,15 +116,15 @@ def add_to_schedule(obj, create, extracted, **kwargs): # pylint: disable=no-self
             ts = obj.meeting.timeslot_set.all()
             obj.timeslotassignments.create(timeslot=ts[random.randrange(len(ts))],schedule=obj.meeting.schedule)
 
-class ScheduleFactory(factory.DjangoModelFactory):
+class ScheduleFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Schedule
 
     meeting = factory.SubFactory(MeetingFactory)
     name = factory.Sequence(lambda n: 'schedule_%d'%n)
     owner = factory.SubFactory(PersonFactory)
 
-class RoomFactory(factory.DjangoModelFactory):
+class RoomFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Room
 
@@ -140,7 +140,7 @@ def session_types(obj, create, extracted, **kwargs): # pylint: disable=no-self-a
                 obj.session_types.add(st)
 
 
-class TimeSlotFactory(factory.DjangoModelFactory):
+class TimeSlotFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = TimeSlot
 
@@ -164,7 +164,7 @@ def time(self):
     def duration(self):
         return datetime.timedelta(minutes=30+random.randrange(9)*15)
 
-class SessionPresentationFactory(factory.DjangoModelFactory):
+class SessionPresentationFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = SessionPresentation
 
@@ -174,7 +174,7 @@ class Meta:
     def rev(self):
         return self.document.rev
 
-class FloorPlanFactory(factory.DjangoModelFactory):
+class FloorPlanFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = FloorPlan
 
@@ -190,7 +190,7 @@ class Meta:
             )
         )
 
-class SlideSubmissionFactory(factory.DjangoModelFactory):
+class SlideSubmissionFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = SlideSubmission
 

ietf/nomcom/factories.py

@@ -5,6 +5,8 @@
 import factory
 import random
 
+from faker import Faker
+
 from ietf.nomcom.models import NomCom, Position, Feedback, Nominee, NomineePosition, Nomination, Topic
 from ietf.group.factories import GroupFactory
 from ietf.person.factories import PersonFactory, UserFactory
@@ -79,7 +81,7 @@ def nomcom_kwargs_for_year(year=None, *args, **kwargs):
     return kwargs
 
 
-class NomComFactory(factory.DjangoModelFactory):
+class NomComFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = NomCom
 
@@ -137,7 +139,7 @@ def populate_topics(obj, create, extracted, **kwargs): # pylint: disable=no-self
             for i in range(3):
                 TopicFactory(nomcom=obj)
 
-class PositionFactory(factory.DjangoModelFactory):
+class PositionFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Position
 
@@ -146,23 +148,23 @@ class Meta:
     accepting_nominations = True
     accepting_feedback = True
 
-class NomineeFactory(factory.DjangoModelFactory):
+class NomineeFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Nominee
 
     nomcom = factory.SubFactory(NomComFactory)
     person = factory.SubFactory(PersonFactory)
     email = factory.LazyAttribute(lambda obj: obj.person.email())
 
-class NomineePositionFactory(factory.DjangoModelFactory):
+class NomineePositionFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = NomineePosition
 
     position = factory.SubFactory(PositionFactory)
     nominee = factory.SubFactory(NomineeFactory)
     state_id = 'accepted'
 
-class FeedbackFactory(factory.DjangoModelFactory):
+class FeedbackFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Feedback
 
@@ -172,10 +174,10 @@ class Meta:
 
     @factory.post_generation
     def comments(obj, create, extracted, **kwargs):
-        comment_text = factory.Faker('paragraph').generate({})
+        comment_text = Faker().paragraph()
         obj.comments = obj.nomcom.encrypt(comment_text)
 
-class TopicFactory(factory.DjangoModelFactory):
+class TopicFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Topic
 
@@ -184,7 +186,7 @@ class Meta:
     accepting_feedback = True
     audience_id = 'general'
 
-class NominationFactory(factory.DjangoModelFactory):
+class NominationFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = Nomination