isort, newer version of black

Author: tsifrer

.travis.yml

@@ -8,7 +8,7 @@ install:
     - pip install .[test]
 before_script:
     - flake8 .
-    - black . --check
+    - black --check .
 script:
     - python setup.py test --pytest-args "tests/ --cov=./"
 after_success:

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Removed support for Python 2, Python 3.4 and Python 3.5
 - Added support for Python 3.7 and 3.8
 - Added new code formatting called black
+- Changed import orders to now be formatted via isort
 - Added TwitchHelix.get_oauth() for fetching OAuth access token
 - Updated docs
 

Makefile

@@ -6,3 +6,11 @@ cov:
 
 cov-html:
 	py.test --cov=./ --cov-report html
+
+format:
+	isort .
+	black .
+
+lint:
+	flake8 .
+	black --check .

setup.cfg

@@ -4,7 +4,7 @@ license_file = LICENSE
 
 [flake8]
 max-line-length = 100
-select = E,W,F,N,I,C
+select = E,W,F,I,C
 ignore = W503
 exclude = docs/
 application-import-names = twitch

setup.py

@@ -35,16 +35,17 @@ def run_tests(self):
 requires = ["requests>=2.23.0"]
 
 test_requirements = [
-    "black==19.10b0",
-    "codecov>=2.1.4",
-    "flake8-import-order>=0.18.1",
-    "flake8>=3.8.3",
-    "pytest-cov>=2.9.0",
-    "pytest>=3",
-    "responses>=0.10.15",
+    "black==20.8b1",
+    "codecov>=2.1.10",
+    "flake8-isort>=4.0.0",
+    "flake8>=3.8.4",
+    "isort>=5.6.4",
+    "pytest-cov>=2.10.1",
+    "pytest>=6.1.2",
+    "responses>=0.12.1",
 ]
 
-doc_reqs = ["Sphinx==3.1.0", "sphinx-autobuild==0.7.1", "sphinx_rtd_theme==0.4.3"]
+doc_reqs = ["Sphinx==3.3.1", "sphinx_rtd_theme==0.5.0"]
 
 extras_require = {
     "doc": doc_reqs,
@@ -72,9 +73,7 @@ def run_tests(self):
     author="Tomaz Sifrer",
     author_email="[email protected]",
     url="https://github.com/tsifrer/python-twitch-client",
-    packages=setuptools.find_packages(
-        exclude=["tests", "tests.*", "samples", "samples.*"]
-    ),
+    packages=["twitch"],
     cmdclass=cmdclass,
     install_requires=requires,
     tests_require=test_requirements,

tests/api/test_base.py

@@ -2,14 +2,11 @@
 import os
 
 import pytest
-
-from requests import exceptions
-
 import responses
+from requests import exceptions
 
 from twitch.api.base import BASE_URL, TwitchAPI
 
-
 dummy_data = {"spongebob": "squarepants"}
 
 

tests/api/test_channel_feed.py

@@ -1,7 +1,6 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient

tests/api/test_channels.py

@@ -1,15 +1,13 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Channel, Community, Follow, Subscription, Team, User, Video
 
-
 example_user = {
     "_id": "44322889",
     "name": "dallas",

tests/api/test_chat.py

@@ -5,7 +5,6 @@
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL
 
-
 example_emote = {"code": "TwitchLit", "id": 115390}
 
 

tests/api/test_collections.py

@@ -1,15 +1,13 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Collection, Item
 
-
 example_collection = {
     "_id": "myIbIFkZphQSbQ",
     "items_count": 3,

tests/api/test_communities.py

@@ -1,15 +1,13 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Community, User
 
-
 example_community = {
     "_id": "e9f17055-810f-4736-ba40-fba4ac541caa",
     "name": "DallasTesterCommunity",

tests/api/test_games.py

@@ -1,15 +1,13 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Game, TopGame
 
-
 example_top_games_response = {
     "_total": 1157,
     "top": [

tests/api/test_ingests.py

@@ -6,7 +6,6 @@
 from twitch.constants import BASE_URL
 from twitch.resources import Ingest
 
-
 example_response = {"ingests": [{"_id": 24, "name": "EU: Amsterdam, NL"}]}
 
 

tests/api/test_search.py

@@ -1,15 +1,13 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Channel, Game, Stream
 
-
 example_channel = {
     "_id": 44322889,
     "name": "dallas",

tests/api/test_streams.py

@@ -1,7 +1,6 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient

tests/api/test_teams.py

@@ -1,15 +1,13 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Team
 
-
 example_team_response = {
     "_id": 10,
     "name": "staff",

tests/api/test_users.py

@@ -1,15 +1,13 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Channel, Follow, Subscription, User, UserBlock
 
-
 example_user = {
     "_id": "44322889",
     "name": "dallas",

tests/api/test_videos.py

@@ -1,15 +1,13 @@
 import json
 
 import pytest
-
 import responses
 
 from twitch.client import TwitchClient
 from twitch.constants import BASE_URL, VOD_FETCH_URL
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Video
 
-
 example_video_response = {
     "_id": "v106400740",
     "description": "Protect your chat with AutoMod!",

tests/helix/test_api.py

@@ -2,7 +2,6 @@
 from datetime import datetime
 
 import pytest
-
 import responses
 
 from twitch import TwitchHelix
@@ -112,17 +111,15 @@
     "access_token": "xxxxxx",
     "expires_in": 123456,
     "token_type": "bearer",
-    "scope":["analytics:read:extensions"]
+    "scope": ["analytics:read:extensions"],
 }
 
 example_get_oauth_error_response = {
     "status": 400,
     "message": "missing client secret",
 }
 
-example_get_oauth_bad_request = {
-    "status": 401
-}
+example_get_oauth_bad_request = {"status": 401}
 
 example_get_videos_response = {
     "data": [
@@ -215,6 +212,7 @@ def test_get_oauth_returns_oauth_token():
 
     assert client._oauth_token
 
+
 @responses.activate
 def test_get_oauth_returns_oauth_token_with_scopes():
     responses.add(
@@ -225,9 +223,12 @@ def test_get_oauth_returns_oauth_token_with_scopes():
         content_type="application/json",
     )
 
-    client = TwitchHelix("client id", client_secret="client secret",scopes=['analytics:read:extensions'])
+    client = TwitchHelix(
+        "client id", client_secret="client secret", scopes=["analytics:read:extensions"]
+    )
     client.get_oauth()
 
+
 @responses.activate
 def test_get_oauth_raises_oauth_exception_bad_request():
     responses.add(
@@ -238,10 +239,11 @@ def test_get_oauth_raises_oauth_exception_bad_request():
         content_type="application/json",
     )
 
-    client = TwitchHelix("client id",client_secret='client secret')
+    client = TwitchHelix("client id", client_secret="client secret")
     with pytest.raises(TwitchOAuthException):
         client.get_oauth()
 
+
 @responses.activate
 def test_get_oauth_raises_oauth_exception_worse_request():
     responses.add(
@@ -252,10 +254,11 @@ def test_get_oauth_raises_oauth_exception_worse_request():
         content_type="application/json",
     )
 
-    client = TwitchHelix("client id",client_secret='client secret')
+    client = TwitchHelix("client id", client_secret="client secret")
     with pytest.raises(TwitchOAuthException):
         client.get_oauth()
 
+
 def test_get_oauth_raises_oauth_exception_missing_secret():
     client = TwitchHelix("client id")
     with pytest.raises(TwitchOAuthException):

twitch/api/__init__.py

@@ -1,7 +1,7 @@
-from .clips import Clips  # noqa
 from .channel_feed import ChannelFeed  # noqa
 from .channels import Channels  # noqa
 from .chat import Chat  # noqa
+from .clips import Clips  # noqa
 from .collections import Collections  # noqa
 from .communities import Communities  # noqa
 from .games import Games  # noqa

twitch/api/channels.py

@@ -1,12 +1,12 @@
 from twitch.api.base import TwitchAPI
 from twitch.constants import (
-    BROADCAST_TYPES,
     BROADCAST_TYPE_HIGHLIGHT,
-    DIRECTIONS,
+    BROADCAST_TYPES,
     DIRECTION_ASC,
     DIRECTION_DESC,
-    VIDEO_SORTS,
+    DIRECTIONS,
     VIDEO_SORT_TIME,
+    VIDEO_SORTS,
 )
 from twitch.decorators import oauth_required
 from twitch.exceptions import TwitchAttributeException

twitch/api/streams.py

@@ -1,5 +1,5 @@
 from twitch.api.base import TwitchAPI
-from twitch.constants import STREAM_TYPES, STREAM_TYPE_LIVE
+from twitch.constants import STREAM_TYPE_LIVE, STREAM_TYPES
 from twitch.decorators import oauth_required
 from twitch.exceptions import TwitchAttributeException
 from twitch.resources import Featured, Stream

twitch/api/users.py

@@ -1,7 +1,7 @@
 from twitch.api.base import TwitchAPI
 from twitch.constants import (
-    DIRECTIONS,
     DIRECTION_DESC,
+    DIRECTIONS,
     MAX_FOLLOWS_LIMIT,
     USERS_SORT_BY,
     USERS_SORT_BY_CREATED_AT,

twitch/api/videos.py

@@ -1,9 +1,9 @@
 from twitch.api.base import TwitchAPI
 from twitch.constants import (
-    BROADCAST_TYPES,
     BROADCAST_TYPE_HIGHLIGHT,
-    PERIODS,
+    BROADCAST_TYPES,
     PERIOD_WEEK,
+    PERIODS,
     VOD_FETCH_URL,
 )
 from twitch.decorators import oauth_required

twitch/helix/api.py

@@ -3,12 +3,12 @@
 from twitch.conf import credentials_from_config_file
 from twitch.constants import (
     BASE_OAUTH_URL,
-    PERIODS,
     PERIOD_ALL,
-    VIDEO_SORTS,
+    PERIODS,
     VIDEO_SORT_TIME,
-    VIDEO_TYPES,
+    VIDEO_SORTS,
     VIDEO_TYPE_ALL,
+    VIDEO_TYPES,
 )
 from twitch.exceptions import TwitchAttributeException, TwitchOAuthException
 from twitch.helix.base import APICursor, APIGet