Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 0 additions & 12 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,3 @@ updates:
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: "npm"
directory: "/docs"
schedule:
interval: "monthly"
groups:
docusaurus:
patterns:
- "@docusaurus/*"
react:
patterns:
- "react"
- "react-dom"
2 changes: 1 addition & 1 deletion scripts/build_pypi_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd ${script_dir}/..
rm -rf ./slack_sdk.egg-info

pip install -U pip && \
pip install twine build && \
pip install -U twine build && \
rm -rf dist/ build/ slack_sdk.egg-info/ && \
python -m build --sdist --wheel && \
twine check dist/*
2 changes: 1 addition & 1 deletion scripts/deploy_to_prod_pypi_org.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd ${script_dir}/..
rm -rf ./slack_sdk.egg-info

pip install -U pip && \
pip install twine build && \
pip install -U twine build && \
rm -rf dist/ build/ slack_sdk.egg-info/ && \
python -m build --sdist --wheel && \
twine check dist/* && \
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy_to_test_pypi_org.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd ${script_dir}/..
rm -rf ./slack_sdk.egg-info

pip install -U pip && \
pip install twine build && \
pip install -U twine build && \
rm -rf dist/ build/ slack_sdk.egg-info/ && \
python -m build --sdist --wheel && \
twine check dist/* && \
Expand Down
11 changes: 8 additions & 3 deletions scripts/generate_api_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ cd ${script_dir}/..

pip install -U -r requirements/documentation.txt
pip install -U -r requirements/optional.txt
rm -rf docs/static/api-docs
pdoc slack_sdk --html -o docs/static/api-docs
open docs/static/api-docs/slack_sdk/index.html

rm -rf docs/reference

pdoc slack_sdk --html -o docs/reference
cp -R docs/reference/slack_sdk/* docs/reference/
rm -rf docs/reference/slack_sdk

open docs/reference/index.html
4 changes: 2 additions & 2 deletions scripts/run_integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ script_dir=`dirname $0`
cd ${script_dir}/..

pip install -U pip
pip install -r requirements/testing.txt \
-r requirements/optional.txt
pip install -U -r requirements/testing.txt \
-U -r requirements/optional.txt

echo "Generating code ..." && python scripts/codegen.py --path .
echo "Running black (code formatter) ..." && black slack_sdk/
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_mypy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ script_dir=$(dirname $0)
cd ${script_dir}/..

pip install -U pip setuptools wheel
pip install -r requirements/testing.txt \
-r requirements/optional.txt
pip install -U -r requirements/testing.txt \
-U -r requirements/optional.txt

mypy --config-file pyproject.toml
4 changes: 2 additions & 2 deletions scripts/run_unit_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ script_dir=`dirname $0`
cd ${script_dir}/..

pip install -U pip
pip install -r requirements/testing.txt \
-r requirements/optional.txt
pip install -U -r requirements/testing.txt \
-U -r requirements/optional.txt

echo "Generating code ..." && python scripts/codegen.py --path .
echo "Running black (code formatter) ..." && black slack_sdk/
Expand Down
5 changes: 2 additions & 3 deletions scripts/run_validation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ set -e
script_dir=`dirname $0`
cd ${script_dir}/..

pip install -U pip setuptools wheel
pip install -r requirements/testing.txt \
-r requirements/optional.txt
pip install -U -r requirements/testing.txt \
-U -r requirements/optional.txt

echo "Generating code ..." && python scripts/codegen.py --path .
echo "Running black (code formatter) ..." && black slack_sdk/
Expand Down
15 changes: 4 additions & 11 deletions slack_sdk/oauth/installation_store/internals.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import sys
from datetime import datetime, timezone
from datetime import datetime
from typing import Type, TypeVar, Union


def _from_iso_format_to_datetime(iso_datetime_str: str) -> datetime:
if sys.version_info[:2] == (3, 6):
format = "%Y-%m-%d %H:%M:%S"
if "." in iso_datetime_str:
format += ".%f"
return datetime.strptime(iso_datetime_str, format).replace(tzinfo=timezone.utc)
else:
if "+" not in iso_datetime_str:
iso_datetime_str += "+00:00"
return datetime.fromisoformat(iso_datetime_str)
if "+" not in iso_datetime_str:
iso_datetime_str += "+00:00"
return datetime.fromisoformat(iso_datetime_str)


def _from_iso_format_to_unix_timestamp(iso_datetime_str: str) -> float:
Expand Down
6 changes: 1 addition & 5 deletions slack_sdk/scim/v1/internal_utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import copy
import logging
import re
import sys
from typing import Dict, Callable
from typing import Union, Optional, Any
from urllib.parse import quote
Expand Down Expand Up @@ -43,10 +42,7 @@ def _to_dict_without_not_given(obj: Any) -> dict:


def _create_copy(original: Any) -> Any:
if sys.version_info.major == 3 and sys.version_info.minor <= 6:
return copy.copy(original)
else:
return copy.deepcopy(original)
return copy.deepcopy(original)


def _to_camel_case_key(key: str) -> str:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def test_timestamp_to_type(ts, target_type, expected_result):


def test_timestamp_to_type_invalid_str():
match = "Invalid isoformat string" if sys.version_info[:2] > (3, 6) else "time data .* does not match format"
match = "Invalid isoformat string"
with pytest.raises(ValueError, match=match):
_timestamp_to_type("not-a-timestamp", int)

Expand Down
Loading