Skip to content

Adding dependencies to setup.py #1178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 25, 2020
Merged

Adding dependencies to setup.py #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6a636a
Adding dependencies to setup.py
axelsrz Jun 25, 2020
488ba6c
pylint fixes
axelsrz Jun 25, 2020
d1edfae
Black compliant
axelsrz Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
import aiohttp
from aiohttp.web_request import Request

from slack.web.client import WebClient
from slack.web.slack_response import SlackResponse

from botbuilder.schema import Activity
from botbuilder.adapters.slack import SlackAdapterOptions
from botbuilder.adapters.slack.slack_message import SlackMessage

from slack.web.client import WebClient
from slack.web.slack_response import SlackResponse

POST_MESSAGE_URL = "https://slack.com/api/chat.postMessage"
POST_EPHEMERAL_MESSAGE_URL = "https://slack.com/api/chat.postEphemeral"

Expand Down
6 changes: 3 additions & 3 deletions libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
from aiohttp.web_request import Request
from aiohttp.web_response import Response

from slack.web.classes.attachments import Attachment

from botbuilder.schema import (
Activity,
ConversationAccount,
ChannelAccount,
ActivityTypes,
)

from slack.web.classes.attachments import Attachment

from .slack_message import SlackMessage
from .slack_client import SlackClient
from .slack_event import SlackEvent
Expand Down Expand Up @@ -53,7 +53,7 @@ def activity_to_slack(activity: Activity) -> SlackMessage:
message.blocks = att.content
else:
new_attachment = Attachment(
author_name=att.name, thumb_url=att.thumbnail_url,
author_name=att.name, thumb_url=att.thumbnail_url, text="",
)
attachments.append(new_attachment)

Expand Down
4 changes: 1 addition & 3 deletions libraries/botbuilder-adapters-slack/botbuilder/adapters/slack/slack_payload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
# Licensed under the MIT License.

from typing import Optional, List

from botbuilder.adapters.slack.slack_message import SlackMessage

from slack.web.classes.actions import Action
from botbuilder.adapters.slack.slack_message import SlackMessage


class SlackPayload:
Expand Down
4 changes: 3 additions & 1 deletion libraries/botbuilder-adapters-slack/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"botbuilder-schema==4.10.0",
"botframework-connector==4.10.0",
"botbuilder-core==4.10.0",
"pyslack",
"slackclient",
]

TEST_REQUIRES = ["aiounittest==1.3.0"]
Expand All @@ -32,7 +34,7 @@
long_description=long_description,
long_description_content_type="text/x-rst",
license=package_info["__license__"],
packages=["botbuilder.adapters", "botbuilder.adapters.slack",],
packages=["botbuilder.adapters.slack"],
install_requires=REQUIRES + TEST_REQUIRES,
tests_require=TEST_REQUIRES,
include_package_data=True,
Expand Down