Merge branch 'feature/fix_dependency'

requirements.txt

@@ -1,6 +1,5 @@
 APScheduler==3.0.4
 assertpy==0.8
-mock==1.3.0
 pbr==1.8.1
 pep8==1.6.2
 py==1.4.30

tests/bot/test_bot_base.py

@@ -7,7 +7,7 @@
 import sys
 from apscheduler.schedulers.background import BackgroundScheduler
 from assertpy import assert_that
-from mock import patch, PropertyMock
+from unittest.mock import patch, PropertyMock
 
 from sarah.bot import Base
 from sarah.bot.values import CommandMessage, ScheduledCommand, Command, \

tests/bot/test_hipchat.py

@@ -7,7 +7,7 @@
 
 import pytest
 from assertpy import assert_that
-from mock import MagicMock, call, patch
+from unittest.mock import MagicMock, patch, call
 from sleekxmpp import ClientXMPP
 from sleekxmpp.exceptions import IqTimeout, IqError
 from sleekxmpp.stanza import Message
@@ -150,7 +150,7 @@ def test_echo_message(self, hipchat):
             self.wait_future_finish(hipchat.message(msg))
             assert_that(hipchat.respond.call_count).is_equal_to(1)
             assert_that(msg.reply.call_count).is_equal_to(1)
-            assert_that(msg.reply.call_args).is_equal_to(call('spam'))
+            assert_that(msg.reply.call_args == call('spam')).is_true()
 
 
 class TestGenerateScheduleJob(object):

tests/bot/test_slack.py

@@ -7,7 +7,7 @@
 
 import pytest
 from assertpy import assert_that
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 import sarah
 from sarah.bot.slack import Slack, SlackClient, SarahSlackException, \