diff --git a/docs/source/development/getting-started.rst b/docs/source/development/getting-started.rst index 8de149f1..47504fd6 100644 --- a/docs/source/development/getting-started.rst +++ b/docs/source/development/getting-started.rst @@ -19,6 +19,7 @@ to install ``nox`` in its own isolated environment. .. code-block:: console $ python -m pip install pipx + $ python -m pipx ensurepath $ pipx install nox You will need to have a working Redis server on your system. You may diff --git a/junction/base/admin.py b/junction/base/admin.py index 66935741..320df5e4 100644 --- a/junction/base/admin.py +++ b/junction/base/admin.py @@ -23,7 +23,10 @@ class TimeAuditAdmin(admin.ModelAdmin): class AuditAdmin(TimeAuditAdmin): - list_display = ("created_by", "modified_by",) + TimeAuditAdmin.list_display + list_display = ( + "created_by", + "modified_by", + ) + TimeAuditAdmin.list_display exclude = ( "created_by", "modified_by", diff --git a/junction/base/models.py b/junction/base/models.py index fdc9c9b1..e779a32c 100644 --- a/junction/base/models.py +++ b/junction/base/models.py @@ -6,8 +6,7 @@ class TimeAuditModel(models.Model): - """To track when the record was created and last modified - """ + """To track when the record was created and last modified""" created_at = models.DateTimeField(auto_now_add=True, verbose_name="Created At") modified_at = models.DateTimeField(auto_now=True, verbose_name="Last Modified At") @@ -17,8 +16,7 @@ class Meta: class UserAuditModel(models.Model): - """ To track who created and last modified the record - """ + """To track who created and last modified the record""" created_by = models.ForeignKey( User, diff --git a/junction/conferences/migrations/0001_initial.py b/junction/conferences/migrations/0001_initial.py index 6217f050..3b92a007 100644 --- a/junction/conferences/migrations/0001_initial.py +++ b/junction/conferences/migrations/0001_initial.py @@ -123,7 +123,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ( @@ -140,7 +141,8 @@ class Migration(migrations.Migration): ( "moderator", models.ForeignKey( - to=settings.AUTH_USER_MODEL, on_delete=models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + on_delete=models.deletion.CASCADE, ), ), ( @@ -187,7 +189,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ( @@ -215,7 +218,8 @@ class Migration(migrations.Migration): ( "reviewer", models.ForeignKey( - to=settings.AUTH_USER_MODEL, on_delete=models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + on_delete=models.deletion.CASCADE, ), ), ], diff --git a/junction/conferences/migrations/0005_emailreviewernotificationsetting.py b/junction/conferences/migrations/0005_emailreviewernotificationsetting.py index eabd51a1..bc70fcdc 100644 --- a/junction/conferences/migrations/0005_emailreviewernotificationsetting.py +++ b/junction/conferences/migrations/0005_emailreviewernotificationsetting.py @@ -77,7 +77,8 @@ class Migration(migrations.Migration): ( "proposal_type", models.ForeignKey( - to="proposals.ProposalType", on_delete=models.deletion.CASCADE, + to="proposals.ProposalType", + on_delete=models.deletion.CASCADE, ), ), ], diff --git a/junction/conferences/migrations/0006_auto_20150216_1929.py b/junction/conferences/migrations/0006_auto_20150216_1929.py index 55bf3a7f..de35f01c 100644 --- a/junction/conferences/migrations/0006_auto_20150216_1929.py +++ b/junction/conferences/migrations/0006_auto_20150216_1929.py @@ -12,19 +12,26 @@ class Migration(migrations.Migration): operations = [ migrations.RemoveField( - model_name="emailreviewernotificationsetting", name="conference_reviewer", + model_name="emailreviewernotificationsetting", + name="conference_reviewer", ), migrations.RemoveField( - model_name="emailreviewernotificationsetting", name="created_by", + model_name="emailreviewernotificationsetting", + name="created_by", ), migrations.RemoveField( - model_name="emailreviewernotificationsetting", name="modified_by", + model_name="emailreviewernotificationsetting", + name="modified_by", ), migrations.RemoveField( - model_name="emailreviewernotificationsetting", name="proposal_section", + model_name="emailreviewernotificationsetting", + name="proposal_section", ), migrations.RemoveField( - model_name="emailreviewernotificationsetting", name="proposal_type", + model_name="emailreviewernotificationsetting", + name="proposal_type", + ), + migrations.DeleteModel( + name="EmailReviewerNotificationSetting", ), - migrations.DeleteModel(name="EmailReviewerNotificationSetting",), ] diff --git a/junction/conferences/migrations/0014_conferencesettings.py b/junction/conferences/migrations/0014_conferencesettings.py index ef780f52..563550f1 100644 --- a/junction/conferences/migrations/0014_conferencesettings.py +++ b/junction/conferences/migrations/0014_conferencesettings.py @@ -8,8 +8,7 @@ def add_default_values(apps, schema_editor): - """Add all default values - """ + """Add all default values""" ConferenceSetting = apps.get_model("conferences", "ConferenceSetting") public_voting = ConferenceSettingConstants.ALLOW_PUBLIC_VOTING_ON_PROPOSALS display_propsals = ConferenceSettingConstants.DISPLAY_PROPOSALS_IN_PUBLIC @@ -80,7 +79,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ( diff --git a/junction/conferences/models.py b/junction/conferences/models.py index 60d59da6..3e3f9a9c 100644 --- a/junction/conferences/models.py +++ b/junction/conferences/models.py @@ -112,8 +112,7 @@ def save(self, *args, **kwargs): super(Conference, self).save(*args, **kwargs) def is_accepting_proposals(self): - """Check if any one of the proposal section is accepting proposal. - """ + """Check if any one of the proposal section is accepting proposal.""" if ( self.status == ConferenceStatus.CLOSED_CFP or self.status == ConferenceStatus.SCHEDULE_PUBLISHED diff --git a/junction/conferences/permissions.py b/junction/conferences/permissions.py index 6e4fdc34..26644a9b 100644 --- a/junction/conferences/permissions.py +++ b/junction/conferences/permissions.py @@ -4,8 +4,7 @@ def is_reviewer(user, conference): - """Returns a boolean indicating if a given user is a conference reviewer. - """ + """Returns a boolean indicating if a given user is a conference reviewer.""" if not user.is_authenticated(): return False diff --git a/junction/feedback/migrations/0001_initial.py b/junction/feedback/migrations/0001_initial.py index 4177a10e..39e2b61a 100644 --- a/junction/feedback/migrations/0001_initial.py +++ b/junction/feedback/migrations/0001_initial.py @@ -45,7 +45,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ( @@ -142,7 +143,8 @@ class Migration(migrations.Migration): ( "schedule_item", models.ForeignKey( - to="schedule.ScheduleItem", on_delete=models.deletion.CASCADE, + to="schedule.ScheduleItem", + on_delete=models.deletion.CASCADE, ), ), ], @@ -217,7 +219,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ( @@ -235,7 +238,8 @@ class Migration(migrations.Migration): model_name="scheduleitemtextfeedback", name="question", field=models.ForeignKey( - to="feedback.TextFeedbackQuestion", on_delete=models.deletion.CASCADE, + to="feedback.TextFeedbackQuestion", + on_delete=models.deletion.CASCADE, ), preserve_default=True, ), diff --git a/junction/feedback/models.py b/junction/feedback/models.py index 11f56406..5c9a1973 100644 --- a/junction/feedback/models.py +++ b/junction/feedback/models.py @@ -22,8 +22,7 @@ class Meta: @python_2_unicode_compatible class TextFeedbackQuestion(BaseSessionQuestionMixin, TimeAuditModel): - """Store details about text feedback type information. - """ + """Store details about text feedback type information.""" title = models.CharField(max_length=255, verbose_name="Text Feedback Title") @@ -44,8 +43,7 @@ def to_response(self): @python_2_unicode_compatible class ChoiceFeedbackQuestion(BaseSessionQuestionMixin, TimeAuditModel): - """Store details about text feedback type information. - """ + """Store details about text feedback type information.""" title = models.CharField(max_length=255, verbose_name="Choice Feedback Title") @@ -71,8 +69,7 @@ def to_response(self): @python_2_unicode_compatible class ChoiceFeedbackQuestionValue(TimeAuditModel): - """Store allowed values for each choice based question - """ + """Store allowed values for each choice based question""" question = models.ForeignKey( ChoiceFeedbackQuestion, related_name="allowed_values", on_delete=models.CASCADE diff --git a/junction/feedback/service.py b/junction/feedback/service.py index 0d06d8af..8947802b 100644 --- a/junction/feedback/service.py +++ b/junction/feedback/service.py @@ -58,8 +58,7 @@ def get_choice_feedback_questions(conference_id): def has_submitted(feedback, device_uuid): - """ - """ + """""" device = Device.objects.get(uuid=device_uuid) text_feedback = ScheduleItemTextFeedback.objects.filter( schedule_item_id=feedback.validated_data["schedule_item_id"], device=device diff --git a/junction/feedback/views.py b/junction/feedback/views.py index ff109898..08ab1788 100644 --- a/junction/feedback/views.py +++ b/junction/feedback/views.py @@ -48,8 +48,7 @@ def post(self, request): def view_feedback(request, schedule_item_id): - """Show text/choice feedback for the schedule. - """ + """Show text/choice feedback for the schedule.""" schedule_item = get_object_or_404(ScheduleItem, pk=schedule_item_id) if not can_view_feedback(user=request.user, schedule_item=schedule_item): return HttpResponseForbidden("Access Denied") diff --git a/junction/profiles/migrations/0001_initial.py b/junction/profiles/migrations/0001_initial.py index c00b6db9..644eaae4 100644 --- a/junction/profiles/migrations/0001_initial.py +++ b/junction/profiles/migrations/0001_initial.py @@ -61,7 +61,8 @@ class Migration(migrations.Migration): ( "user", models.OneToOneField( - to=settings.AUTH_USER_MODEL, on_delete=models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + on_delete=models.deletion.CASCADE, ), ), ], diff --git a/junction/proposals/dashboard.py b/junction/proposals/dashboard.py index 990d4d46..84246698 100644 --- a/junction/proposals/dashboard.py +++ b/junction/proposals/dashboard.py @@ -197,7 +197,10 @@ def reviewer_votes_dashboard(request, conference_slug): proposal_sections = conference.proposal_sections.all() proposals_qs = Proposal.objects.select_related( - "proposal_type", "proposal_section", "conference", "author", + "proposal_type", + "proposal_section", + "conference", + "author", ).filter(conference=conference, status=ProposalStatus.PUBLIC) proposals = [] @@ -247,7 +250,10 @@ def second_phase_voting(request, conference_slug): proposal_sections = conference.proposal_sections.all() proposals_qs = Proposal.objects.select_related( - "proposal_type", "proposal_section", "conference", "author", + "proposal_type", + "proposal_section", + "conference", + "author", ).filter(conference=conference, review_status=ProposalReviewStatus.SELECTED) proposals = [] @@ -298,7 +304,10 @@ def export_reviewer_votes(request, conference_slug): proposal_sections = conference.proposal_sections.all() proposals_qs = Proposal.objects.select_related( - "proposal_type", "proposal_section", "conference", "author", + "proposal_type", + "proposal_section", + "conference", + "author", ).filter(conference=conference, status=ProposalStatus.PUBLIC) proposals_qs = sorted( proposals_qs, key=lambda x: x.get_reviewer_votes_sum(), reverse=True @@ -334,7 +343,8 @@ def export_reviewer_votes(request, conference_slug): [ comment.comment for comment in p.proposalcomment_set.filter( - vote=True, deleted=False, + vote=True, + deleted=False, ) ] ) @@ -346,7 +356,10 @@ def export_reviewer_votes(request, conference_slug): p.get_reviewer_votes_count(), ) + vote_details - + (p.get_votes_count(), vote_comment,) + + ( + p.get_votes_count(), + vote_comment, + ) ) if ( p.get_reviewer_votes_count_by_value( diff --git a/junction/proposals/migrations/0001_initial.py b/junction/proposals/migrations/0001_initial.py index 4dce77c9..3c5881b1 100644 --- a/junction/proposals/migrations/0001_initial.py +++ b/junction/proposals/migrations/0001_initial.py @@ -43,7 +43,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ( @@ -101,7 +102,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ( @@ -215,7 +217,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ], @@ -256,13 +259,15 @@ class Migration(migrations.Migration): ( "commenter", models.ForeignKey( - to=settings.AUTH_USER_MODEL, on_delete=models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + on_delete=models.deletion.CASCADE, ), ), ( "proposal", models.ForeignKey( - to="proposals.Proposal", on_delete=models.deletion.CASCADE, + to="proposals.Proposal", + on_delete=models.deletion.CASCADE, ), ), ], @@ -302,7 +307,8 @@ class Migration(migrations.Migration): ( "voter", models.ForeignKey( - to=settings.AUTH_USER_MODEL, on_delete=models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + on_delete=models.deletion.CASCADE, ), ), ], @@ -457,13 +463,15 @@ class Migration(migrations.Migration): ( "proposal", models.ForeignKey( - to="proposals.Proposal", on_delete=models.deletion.CASCADE, + to="proposals.Proposal", + on_delete=models.deletion.CASCADE, ), ), ( "voter", models.ForeignKey( - to=settings.AUTH_USER_MODEL, on_delete=models.deletion.CASCADE, + to=settings.AUTH_USER_MODEL, + on_delete=models.deletion.CASCADE, ), ), ], @@ -471,7 +479,8 @@ class Migration(migrations.Migration): bases=(models.Model,), ), migrations.AlterUniqueTogether( - name="proposalvote", unique_together=set([("proposal", "voter")]), + name="proposalvote", + unique_together=set([("proposal", "voter")]), ), migrations.AlterUniqueTogether( name="proposalcommentvote", @@ -498,7 +507,8 @@ class Migration(migrations.Migration): preserve_default=True, ), migrations.AlterUniqueTogether( - name="proposal", unique_together=set([("conference", "slug")]), + name="proposal", + unique_together=set([("conference", "slug")]), ), migrations.AddField( model_name="conferenceproposaltype", diff --git a/junction/proposals/migrations/0002_auto_20150105_2220.py b/junction/proposals/migrations/0002_auto_20150105_2220.py index 8816f4c4..4d36d1d2 100644 --- a/junction/proposals/migrations/0002_auto_20150105_2220.py +++ b/junction/proposals/migrations/0002_auto_20150105_2220.py @@ -13,33 +13,51 @@ class Migration(migrations.Migration): operations = [ migrations.AlterUniqueTogether( - name="conferenceproposalsection", unique_together=None, + name="conferenceproposalsection", + unique_together=None, ), migrations.RemoveField( - model_name="conferenceproposalsection", name="conference", + model_name="conferenceproposalsection", + name="conference", ), migrations.RemoveField( - model_name="conferenceproposalsection", name="created_by", + model_name="conferenceproposalsection", + name="created_by", ), migrations.RemoveField( - model_name="conferenceproposalsection", name="modified_by", + model_name="conferenceproposalsection", + name="modified_by", ), migrations.RemoveField( - model_name="conferenceproposalsection", name="proposal_section", + model_name="conferenceproposalsection", + name="proposal_section", + ), + migrations.DeleteModel( + name="ConferenceProposalSection", ), - migrations.DeleteModel(name="ConferenceProposalSection",), migrations.AlterUniqueTogether( - name="conferenceproposaltype", unique_together=None, + name="conferenceproposaltype", + unique_together=None, + ), + migrations.RemoveField( + model_name="conferenceproposaltype", + name="conference", ), - migrations.RemoveField(model_name="conferenceproposaltype", name="conference",), - migrations.RemoveField(model_name="conferenceproposaltype", name="created_by",), migrations.RemoveField( - model_name="conferenceproposaltype", name="modified_by", + model_name="conferenceproposaltype", + name="created_by", ), migrations.RemoveField( - model_name="conferenceproposaltype", name="proposal_type", + model_name="conferenceproposaltype", + name="modified_by", + ), + migrations.RemoveField( + model_name="conferenceproposaltype", + name="proposal_type", + ), + migrations.DeleteModel( + name="ConferenceProposalType", ), - migrations.DeleteModel(name="ConferenceProposalType",), migrations.AddField( model_name="proposalsection", name="conferences", diff --git a/junction/proposals/migrations/0007_auto_20150525_2150.py b/junction/proposals/migrations/0007_auto_20150525_2150.py index 5ad089f9..dc4a3c76 100644 --- a/junction/proposals/migrations/0007_auto_20150525_2150.py +++ b/junction/proposals/migrations/0007_auto_20150525_2150.py @@ -43,7 +43,8 @@ class Migration(migrations.Migration): ( "proposal", models.ForeignKey( - to="proposals.Proposal", on_delete=models.deletion.CASCADE, + to="proposals.Proposal", + on_delete=models.deletion.CASCADE, ), ), ( diff --git a/junction/proposals/migrations/0008_auto_20150528_2243.py b/junction/proposals/migrations/0008_auto_20150528_2243.py index 1c528b17..b73f1ade 100644 --- a/junction/proposals/migrations/0008_auto_20150528_2243.py +++ b/junction/proposals/migrations/0008_auto_20150528_2243.py @@ -12,7 +12,8 @@ class Migration(migrations.Migration): operations = [ migrations.RemoveField( - model_name="proposalsectionreviewervote", name="up_vote", + model_name="proposalsectionreviewervote", + name="up_vote", ), migrations.AddField( model_name="proposalsectionreviewervote", diff --git a/junction/proposals/migrations/0014_auto_20150729_0131.py b/junction/proposals/migrations/0014_auto_20150729_0131.py index cc4d438d..50e161c8 100644 --- a/junction/proposals/migrations/0014_auto_20150729_0131.py +++ b/junction/proposals/migrations/0014_auto_20150729_0131.py @@ -13,8 +13,14 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RemoveField(model_name="proposalsection", name="end_date",), - migrations.RemoveField(model_name="proposalsection", name="start_date",), + migrations.RemoveField( + model_name="proposalsection", + name="end_date", + ), + migrations.RemoveField( + model_name="proposalsection", + name="start_date", + ), migrations.AddField( model_name="proposaltype", name="end_date", diff --git a/junction/proposals/migrations/0018_auto_20160806_1727.py b/junction/proposals/migrations/0018_auto_20160806_1727.py index 64b74058..b753a6ad 100644 --- a/junction/proposals/migrations/0018_auto_20160806_1727.py +++ b/junction/proposals/migrations/0018_auto_20160806_1727.py @@ -11,7 +11,10 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RemoveField(model_name="proposalcomment", name="type",), + migrations.RemoveField( + model_name="proposalcomment", + name="type", + ), migrations.AddField( model_name="historicalproposalsectionreviewervote", name="phase", diff --git a/junction/proposals/migrations/0020_auto_20160806_2023.py b/junction/proposals/migrations/0020_auto_20160806_2023.py index 2af1c830..9f2f2031 100644 --- a/junction/proposals/migrations/0020_auto_20160806_2023.py +++ b/junction/proposals/migrations/0020_auto_20160806_2023.py @@ -12,6 +12,7 @@ class Migration(migrations.Migration): operations = [ migrations.AlterUniqueTogether( - name="proposalsectionreviewervote", unique_together=set([]), + name="proposalsectionreviewervote", + unique_together=set([]), ), ] diff --git a/junction/proposals/migrations/0021_auto_20160905_0044.py b/junction/proposals/migrations/0021_auto_20160905_0044.py index 57b97898..86544b8a 100644 --- a/junction/proposals/migrations/0021_auto_20160905_0044.py +++ b/junction/proposals/migrations/0021_auto_20160905_0044.py @@ -12,6 +12,7 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( - name="proposalcomment", options={"ordering": ("created_at",)}, + name="proposalcomment", + options={"ordering": ("created_at",)}, ), ] diff --git a/junction/proposals/migrations/0022_auto_20170610_1600.py b/junction/proposals/migrations/0022_auto_20170610_1600.py index b9d1c053..4c668968 100644 --- a/junction/proposals/migrations/0022_auto_20170610_1600.py +++ b/junction/proposals/migrations/0022_auto_20170610_1600.py @@ -47,7 +47,8 @@ class Migration(migrations.Migration): model_name="spamcomment", name="comment", field=models.ForeignKey( - on_delete=models.deletion.CASCADE, to="proposals.ProposalComment", + on_delete=models.deletion.CASCADE, + to="proposals.ProposalComment", ), ), migrations.AddField( @@ -58,6 +59,7 @@ class Migration(migrations.Migration): ), ), migrations.AlterUniqueTogether( - name="spamcomment", unique_together=set([("comment", "marked_by")]), + name="spamcomment", + unique_together=set([("comment", "marked_by")]), ), ] diff --git a/junction/proposals/migrations/0023_auto_20170610_1633.py b/junction/proposals/migrations/0023_auto_20170610_1633.py index 398c8708..0ae1dcaf 100644 --- a/junction/proposals/migrations/0023_auto_20170610_1633.py +++ b/junction/proposals/migrations/0023_auto_20170610_1633.py @@ -13,6 +13,7 @@ class Migration(migrations.Migration): operations = [ migrations.AlterIndexTogether( - name="spamcomment", index_together=set([("comment", "marked_by")]), + name="spamcomment", + index_together=set([("comment", "marked_by")]), ), ] diff --git a/junction/proposals/migrations/0024_auto_20170610_1857.py b/junction/proposals/migrations/0024_auto_20170610_1857.py index a8e5cdd2..4ee0fb86 100644 --- a/junction/proposals/migrations/0024_auto_20170610_1857.py +++ b/junction/proposals/migrations/0024_auto_20170610_1857.py @@ -14,10 +14,22 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AlterUniqueTogether(name="spamcomment", unique_together=set([]),), - migrations.AlterIndexTogether(name="spamcomment", index_together=set([]),), - migrations.RemoveField(model_name="spamcomment", name="comment",), - migrations.RemoveField(model_name="spamcomment", name="marked_by",), + migrations.AlterUniqueTogether( + name="spamcomment", + unique_together=set([]), + ), + migrations.AlterIndexTogether( + name="spamcomment", + index_together=set([]), + ), + migrations.RemoveField( + model_name="spamcomment", + name="comment", + ), + migrations.RemoveField( + model_name="spamcomment", + name="marked_by", + ), migrations.AddField( model_name="proposalcomment", name="marked_as_spam_by", @@ -34,5 +46,7 @@ class Migration(migrations.Migration): name="proposalcomment", index_together=set([("is_spam", "marked_as_spam_by")]), ), - migrations.DeleteModel(name="SpamComment",), + migrations.DeleteModel( + name="SpamComment", + ), ] diff --git a/junction/proposals/models.py b/junction/proposals/models.py index 9ce59543..81634935 100644 --- a/junction/proposals/models.py +++ b/junction/proposals/models.py @@ -101,7 +101,9 @@ class Proposal(TimeAuditModel): verbose_name="Target Audience", ) video_url = models.URLField( - blank=True, default="", help_text="Short 1-2 min video describing your talk", + blank=True, + default="", + help_text="Short 1-2 min video describing your talk", ) prerequisites = models.TextField(blank=True, default="") content_urls = models.TextField(blank=True, default="") @@ -210,14 +212,17 @@ def get_reviewer_votes_count_by_value(self, vote_value): ).count() def get_reviewer_votes_sum(self): - votes = ProposalSectionReviewerVote.objects.filter(proposal=self,) + votes = ProposalSectionReviewerVote.objects.filter( + proposal=self, + ) sum_of_votes = sum((v.vote_value.vote_value for v in votes)) return sum_of_votes def get_reviewer_vote_value(self, reviewer): try: vote = ProposalSectionReviewerVote.objects.get( - proposal=self, voter__conference_reviewer__reviewer=reviewer, + proposal=self, + voter__conference_reviewer__reviewer=reviewer, ) return vote.vote_value.vote_value except ProposalSectionReviewerVote.DoesNotExist: @@ -233,14 +238,14 @@ def has_negative_votes(self): """ Show sum of reviewer votes for given vote value. """ return ( ProposalSectionReviewerVote.objects.filter( - proposal=self, vote_value__vote_value=ProposalReviewVote.NOT_ALLOWED, + proposal=self, + vote_value__vote_value=ProposalReviewVote.NOT_ALLOWED, ).count() > 0 ) def to_response(self, request): - """method will return dict which can be passed to response - """ + """method will return dict which can be passed to response""" author = "{} {}".format(self.author.first_name, self.author.last_name) data = { "id": self.id, diff --git a/junction/proposals/services.py b/junction/proposals/services.py index 13987c15..ffa8bb8c 100644 --- a/junction/proposals/services.py +++ b/junction/proposals/services.py @@ -171,8 +171,7 @@ def send_mail_for_proposal_content(conference_id, proposal_id, host): def user_action_for_spam(user, threshold): - """When a comment is marked as spam, make appropriate status update to user model - """ + """When a comment is marked as spam, make appropriate status update to user model""" total_spam = ProposalComment.objects.filter(commenter=user, is_spam=True).count() if total_spam >= threshold: if user.is_active is True: diff --git a/junction/proposals/views.py b/junction/proposals/views.py index c35cc013..e90db1d5 100644 --- a/junction/proposals/views.py +++ b/junction/proposals/views.py @@ -95,7 +95,10 @@ def list_proposals(request, conference_slug): ) proposals_qs = Proposal.objects.filter(conference=conference).select_related( - "proposal_type", "proposal_section", "conference", "author", + "proposal_type", + "proposal_section", + "conference", + "author", ) is_filtered, filter_name, proposals_qs = _filter_proposals(request, proposals_qs) @@ -193,8 +196,7 @@ def create_proposal(request, conference_slug): @require_http_methods(["GET"]) def detail_proposal(request, conference_slug, slug, hashid=None): - """Display a proposal detail page. - """ + """Display a proposal detail page.""" # Here try to get a proposal by it's hashid. If the slug didn't match because # the title might have changed, redirect to the correct slug. # hashid is optional due to backward compatibility. If the hashid is not present @@ -349,7 +351,10 @@ def proposals_to_review(request, conference_slug): proposals_qs = ( Proposal.objects.select_related( - "proposal_type", "proposal_section", "conference", "author", + "proposal_type", + "proposal_section", + "conference", + "author", ) .filter(conference=conference) .filter(status=ProposalStatus.PUBLIC) diff --git a/junction/schedule/migrations/0001_initial.py b/junction/schedule/migrations/0001_initial.py index 18354136..0b169c0b 100644 --- a/junction/schedule/migrations/0001_initial.py +++ b/junction/schedule/migrations/0001_initial.py @@ -55,7 +55,8 @@ class Migration(migrations.Migration): ( "conference", models.ForeignKey( - to="conferences.Conference", on_delete=models.deletion.CASCADE, + to="conferences.Conference", + on_delete=models.deletion.CASCADE, ), ), ( @@ -101,6 +102,7 @@ class Migration(migrations.Migration): bases=(models.Model,), ), migrations.AlterIndexTogether( - name="scheduleitem", index_together=set([("event_date", "start_time")]), + name="scheduleitem", + index_together=set([("event_date", "start_time")]), ), ] diff --git a/junction/schedule/migrations/0008_auto_20200322_1904.py b/junction/schedule/migrations/0008_auto_20200322_1904.py index 41950dd5..d33e2a66 100644 --- a/junction/schedule/migrations/0008_auto_20200322_1904.py +++ b/junction/schedule/migrations/0008_auto_20200322_1904.py @@ -41,7 +41,9 @@ class Migration(migrations.Migration): model_name="scheduleitem", name="room", field=models.ForeignKey( - null=True, on_delete=models.deletion.SET_NULL, to="conferences.Room", + null=True, + on_delete=models.deletion.SET_NULL, + to="conferences.Room", ), ), migrations.AlterField( diff --git a/junction/schedule/models.py b/junction/schedule/models.py index 109a06d6..4c1b29d6 100644 --- a/junction/schedule/models.py +++ b/junction/schedule/models.py @@ -74,8 +74,7 @@ class Meta: index_together = [("event_date", "start_time")] def to_response(self, request): - """method will return dict which can be passed to response - """ + """method will return dict which can be passed to response""" data = { "id": self.id, "room_id": getattr(self.room, "id", None), diff --git a/junction/tickets/migrations/0002_auto_20170104_0124.py b/junction/tickets/migrations/0002_auto_20170104_0124.py index 4e845bc5..2e27fb71 100644 --- a/junction/tickets/migrations/0002_auto_20170104_0124.py +++ b/junction/tickets/migrations/0002_auto_20170104_0124.py @@ -12,6 +12,8 @@ class Migration(migrations.Migration): operations = [ migrations.AlterField( - model_name="ticket", name="email", field=models.EmailField(max_length=254), + model_name="ticket", + name="email", + field=models.EmailField(max_length=254), ) ] diff --git a/junction/tickets/migrations/0002_auto_20170105_1713.py b/junction/tickets/migrations/0002_auto_20170105_1713.py index 8b5fc53d..121eb869 100644 --- a/junction/tickets/migrations/0002_auto_20170105_1713.py +++ b/junction/tickets/migrations/0002_auto_20170105_1713.py @@ -13,6 +13,8 @@ class Migration(migrations.Migration): operations = [ migrations.AlterField( - model_name="ticket", name="email", field=models.EmailField(max_length=254), + model_name="ticket", + name="email", + field=models.EmailField(max_length=254), ), ] diff --git a/junction/tickets/migrations/0002_auto_20170404_2243.py b/junction/tickets/migrations/0002_auto_20170404_2243.py index 2ead89a1..cd101b66 100644 --- a/junction/tickets/migrations/0002_auto_20170404_2243.py +++ b/junction/tickets/migrations/0002_auto_20170404_2243.py @@ -12,6 +12,8 @@ class Migration(migrations.Migration): operations = [ migrations.AlterField( - model_name="ticket", name="email", field=models.EmailField(max_length=254), + model_name="ticket", + name="email", + field=models.EmailField(max_length=254), ), ] diff --git a/junction/urls.py b/junction/urls.py index dff499e1..2c89c225 100644 --- a/junction/urls.py +++ b/junction/urls.py @@ -78,37 +78,51 @@ # Static Pages. TODO: to be refactored url( r"^speakers/$", - TemplateView.as_view(template_name="static-content/speakers.html",), + TemplateView.as_view( + template_name="static-content/speakers.html", + ), name="speakers-static", ), url( r"^schedule/$", - TemplateView.as_view(template_name="static-content/schedule.html",), + TemplateView.as_view( + template_name="static-content/schedule.html", + ), name="schedule-static", ), url( r"^venue/$", - TemplateView.as_view(template_name="static-content/venue.html",), + TemplateView.as_view( + template_name="static-content/venue.html", + ), name="venue-static", ), url( r"^sponsors/$", - TemplateView.as_view(template_name="static-content/sponsors.html",), + TemplateView.as_view( + template_name="static-content/sponsors.html", + ), name="sponsors-static", ), url( r"^blog/$", - TemplateView.as_view(template_name="static-content/blog-archive.html",), + TemplateView.as_view( + template_name="static-content/blog-archive.html", + ), name="blog-archive", ), url( r"^coc/$", - TemplateView.as_view(template_name="static-content/coc.html",), + TemplateView.as_view( + template_name="static-content/coc.html", + ), name="coc-static", ), url( r"^faq/$", - TemplateView.as_view(template_name="static-content/faq.html",), + TemplateView.as_view( + template_name="static-content/faq.html", + ), name="faq-static", ), # Conference Pages diff --git a/settings/common.py b/settings/common.py index 36d473d3..b077684f 100644 --- a/settings/common.py +++ b/settings/common.py @@ -143,7 +143,10 @@ "filters": ["require_debug_false"], "class": "django.utils.log.AdminEmailHandler", }, - "console": {"level": "DEBUG", "class": "logging.StreamHandler",}, + "console": { + "level": "DEBUG", + "class": "logging.StreamHandler", + }, "file": { "level": "DEBUG", "class": "logging.FileHandler", @@ -152,11 +155,18 @@ }, "loggers": { "django.request": { - "handlers": ["mail_admins",], + "handlers": [ + "mail_admins", + ], "level": "ERROR", "propagate": True, }, - "django.db.backends": {"level": "DEBUG", "handlers": ["file",],}, + "django.db.backends": { + "level": "DEBUG", + "handlers": [ + "file", + ], + }, }, } diff --git a/settings/test_settings.py b/settings/test_settings.py index eb331501..d2101d00 100644 --- a/settings/test_settings.py +++ b/settings/test_settings.py @@ -16,7 +16,9 @@ } TEMPLATES[0]["OPTIONS"]["context_processors"].extend( - ["django.core.context_processors.debug",] + [ + "django.core.context_processors.debug", + ] ) EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"