Merge branch 'staging' into change_env_channels

Author: apex-omontgomery

pybot/__main__.py

@@ -17,6 +17,13 @@
 VERSION = "0.1.0"
 logger = logging.getLogger(__name__)
 
+slack_configs = {
+    'token': os.environ.get('BOT_OATH_TOKEN'),
+    'verify': os.environ.get('VERIFICATION_TOKEN'),
+    'bot_id': os.environ.get('SLACK_BOT_ID'),
+    'bot_user_id': os.environ.get('SLACK_BOT_ID'),
+}
+
 
 def make_sentry_logger():
     client = raven.Client(

pybot/endpoints/airtable/utils.py

@@ -10,7 +10,6 @@
 from pybot.endpoints.slack.utils import MENTOR_CHANNEL
 from .message_templates.messages import claim_mentee_attachment, mentor_request_text
 
-
 async def _get_requested_mentor(requested_mentor: Optional[str], slack: SlackAPI,
                                 airtable: AirtableAPI) -> Optional[str]:
     try: