From bb7c9f28536309ab8bb23b627ce3e43bec7616d2 Mon Sep 17 00:00:00 2001 From: ShraddhaAg Date: Mar 03 2019 21:11:47 +0000 Subject: Remove Fedmsg as a dependency Since fedmsg is deprecated in favour of fedora-messaging, this commit removes the fedmsg dependency of the project. --- diff --git a/happinesspackets/messaging/views.py b/happinesspackets/messaging/views.py index 3789893..eb7beae 100644 --- a/happinesspackets/messaging/views.py +++ b/happinesspackets/messaging/views.py @@ -16,8 +16,6 @@ from django.contrib.auth.mixins import LoginRequiredMixin from .forms import MessageSendForm, MessageRecipientForm from .models import Message, BLACKLIST_HMAC_SALT, BlacklistedEmail, strip_email -import fedmsg - logger = logging.getLogger(__name__) @@ -147,6 +145,5 @@ class MessageRecipientMessageUpdate(UpdateView): if msg.sender_approved_public and msg.recipient_approved_public: sender_name = msg.sender_name if msg.sender_approved_public_named else "Anonymous" recipient_name = msg.recipient_name if msg.recipient_approved_public_named else "Anonymous" - fedmsg.publish(topic='happinesspacket.send', msg={'id': msg.identifier, 'sender_name': sender_name, 'recipient_name': recipient_name, 'text': msg.message,}) messages.success(self.request, "Your choices have been saved.") return HttpResponseRedirect(self.request.path) diff --git a/requirements/base.txt b/requirements/base.txt index 31cec1a..ccf4320 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -33,6 +33,5 @@ python-dateutil==2.5.0 factory-boy==2.9.2 opbeat==3.3 mozilla-django-oidc==1.0.0 -fedmsg==1.1.1 celery[redis]==4.2.1 django-celery-email==2.0.1