Skip to content
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

Jump to bottom

chore(dep): Unpin slackclient dependency #21586

Merged
merged 7 commits into from
Oct 4, 2022
Merged

chore(dep): Unpin slackclient dependency #21586

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dca50c6
Unpin slackclient dependency which is now deprecated. Move to it's su…
Sep 26, 2022
3299f02
Make holidays dep open-ended, missed in #21091. While here, also make…
Sep 26, 2022
e493f22
Add upper bounds
ecederstrand Sep 26, 2022
53f21a7
Add upper bounds
ecederstrand Sep 26, 2022
ca84554
Bump holidays and add upper limit
ecederstrand Sep 26, 2022
db7688b
Update base.txt after ca84554a
Sep 26, 2022
3546c50
Merge branch 'master' into bump-slackclient-dep
ecederstrand Sep 26, 2022
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
22 changes: 1 addition & 21 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,14 @@
#
-e file:.
# via -r requirements/base.in
aiohttp==3.8.1
# via slackclient
aiosignal==1.2.0
# via aiohttp
alembic==1.6.5
# via flask-migrate
amqp==5.1.0
# via kombu
apispec[yaml]==3.3.2
# via flask-appbuilder
async-timeout==4.0.2
# via aiohttp
attrs==21.2.0
# via
# aiohttp
# jsonschema
babel==2.9.1
# via flask-babel
Expand All @@ -39,8 +32,6 @@ celery==5.2.2
# via apache-superset
cffi==1.14.6
# via cryptography
charset-normalizer==2.0.4
# via aiohttp
click==8.0.4
# via
# apache-superset
Expand Down Expand Up @@ -110,10 +101,6 @@ flask-wtf==0.14.3
# via
# apache-superset
# flask-appbuilder
frozenlist==1.3.0
# via
# aiohttp
# aiosignal
func-timeout==4.3.5
# via apache-superset
geographiclib==1.52
Expand All @@ -135,7 +122,6 @@ humanize==3.11.0
idna==3.2
# via
# email-validator
# yarl
isodate==0.6.0
# via apache-superset
itsdangerous==2.1.1
Expand Down Expand Up @@ -172,10 +158,6 @@ marshmallow-sqlalchemy==0.23.1
# via flask-appbuilder
msgpack==1.0.2
# via apache-superset
multidict==5.1.0
# via
# aiohttp
# yarl
numpy==1.22.1
# via
# apache-superset
Expand Down Expand Up @@ -259,7 +241,7 @@ six==1.16.0
# python-dateutil
# sqlalchemy-utils
# wtforms-json
slackclient==2.5.0
slack_sdk==3.18.3
# via apache-superset
sqlalchemy==1.4.36
# via
Expand Down Expand Up @@ -301,8 +283,6 @@ wtforms==2.3.3
# wtforms-json
wtforms-json==0.3.3
# via apache-superset
yarl==1.6.3
# via aiohttp

# The following packages are considered to be unsafe in a requirements file:
# setuptools
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def get_git_sha() -> str:
"graphlib-backport",
"gunicorn>=20.1.0",
"hashids>=1.3.1, <2",
"holidays==0.14.2",
"holidays>=0.14.2",
ecederstrand marked this conversation as resolved.
Show resolved Hide resolved
"humanize",
"isodate",
"markdown>=3.0",
Expand All @@ -114,11 +114,11 @@ def get_git_sha() -> str:
"redis",
"selenium>=3.141.0",
"simplejson>=3.15.0",
"slackclient==2.5.0", # PINNED! slack changes file upload api in the future versions
"slack_sdk>=3.1.1",
ecederstrand marked this conversation as resolved.
Show resolved Hide resolved
"sqlalchemy>=1.4, <2",
"sqlalchemy-utils>=0.38.3, <0.39",
"sqlparse==0.3.0", # PINNED! see https://github.com/andialbrecht/sqlparse/issues/562
"tabulate==0.8.9",
"tabulate>=0.8.9",
ecederstrand marked this conversation as resolved.
Show resolved Hide resolved
# needed to support Literal (3.8) and TypeGuard (3.10)
"typing-extensions>=3.10, <4",
"wtforms-json",
Expand Down
4 changes: 2 additions & 2 deletions superset/reports/notifications/slack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

import backoff
from flask_babel import gettext as __
from slack import WebClient
from slack.errors import SlackApiError, SlackClientError
from slack_sdk import WebClient
from slack_sdk.errors import SlackApiError, SlackClientError

from superset import app
from superset.reports.models import ReportRecipientType
Expand Down
6 changes: 3 additions & 3 deletions superset/tasks/slack_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

import backoff
from flask import current_app
from slack import WebClient
from slack.errors import SlackApiError
from slack.web.slack_response import SlackResponse
from slack_sdk import WebClient
from slack_sdk.errors import SlackApiError
from slack_sdk.web.slack_response import SlackResponse

# Globals
logger = logging.getLogger("tasks.slack_util")
Expand Down