Add isort

.github/workflows/test_tap.yml

@@ -56,9 +56,10 @@ jobs:
       run: |
         poetry install
       if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-    - name: Check formatting with black
+    - name: Check formatting with black and isort
       run: |
         poetry run black --check .
+        poetry run isort --check .
     - name: Check typing annotations with mypy
       run: |
         poetry run mypy . --ignore-missing-imports

pyproject.toml

@@ -27,6 +27,7 @@ types-beautifulsoup4 = "^4.11.1"
 types-requests = "^2.25.6"
 types-python-dateutil = "^2.8.9"
 requests-cache = "^0.9.1"
+isort = "^5.10.1"
 
 [[tool.mypy.overrides]]
 module = [

tap_github/client.py

@@ -1,16 +1,15 @@
 """REST client handling, including GitHubStream base class."""
 
+import collections
+import inspect
+import re
 from types import FrameType
 from typing import Any, Dict, Iterable, List, Optional, cast
+from urllib.parse import parse_qs, urlparse
 
-import inspect
 import requests
-
 from dateutil.parser import parse
-from urllib.parse import parse_qs, urlparse
-
 from nested_lookup import nested_lookup
-
 from singer_sdk.exceptions import FatalAPIError, RetriableAPIError
 from singer_sdk.helpers.jsonpath import extract_jsonpath
 from singer_sdk.streams import GraphQLStream, RESTStream

tap_github/organization_streams.py

@@ -1,6 +1,6 @@
 """User Stream types classes for tap-github."""
 
-from typing import Dict, List, Optional, Iterable, Any
+from typing import Any, Dict, Iterable, List, Optional
 
 from singer_sdk import typing as th  # JSON Schema typing helpers
 

tap_github/repository_streams.py

@@ -1,20 +1,19 @@
 """Repository Stream types classes for tap-github."""
 
 from typing import Any, Dict, Iterable, List, Optional, Tuple
+from urllib.parse import parse_qs, urlparse
 
 import requests
+from dateutil.parser import parse
 from singer_sdk import typing as th  # JSON Schema typing helpers
 from singer_sdk.helpers.jsonpath import extract_jsonpath
 
-from dateutil.parser import parse
-from urllib.parse import parse_qs, urlparse
-
 from tap_github.client import GitHubGraphqlStream, GitHubRestStream
 from tap_github.schema_objects import (
-    user_object,
     label_object,
-    reactions_object,
     milestone_object,
+    reactions_object,
+    user_object,
 )
 from tap_github.scraping import scrape_dependents
 

tap_github/scraping.py

@@ -3,12 +3,12 @@
 Inspired by https://github.com/dogsheep/github-to-sqlite/pull/70
 """
 import logging
-import requests
 import time
-
 from typing import Any, Dict, Iterable, Optional
 from urllib.parse import urlparse
 
+import requests
+
 
 def scrape_dependents(
     response: requests.Response, logger: Optional[logging.Logger] = None
@@ -36,8 +36,7 @@ def scrape_dependents(
 
 def _scrape_dependents(url: str, logger: logging.Logger) -> Iterable[Dict[str, Any]]:
     # Optional dependency:
-    from bs4 import BeautifulSoup
-    from bs4 import Tag
+    from bs4 import BeautifulSoup, Tag
 
     s = requests.Session()
 

tap_github/streams.py

@@ -1,8 +1,14 @@
 from enum import Enum
-from typing import Type, Set, List
+from typing import List, Set, Type
 
 from singer_sdk.streams.core import Stream
 
+from tap_github.organization_streams import (
+    OrganizationStream,
+    TeamMembersStream,
+    TeamRolesStream,
+    TeamsStream,
+)
 from tap_github.repository_streams import (
     AnonymousContributorsStream,
     AssigneesStream,
@@ -36,17 +42,7 @@
     WorkflowRunsStream,
     WorkflowsStream,
 )
-from tap_github.user_streams import (
-    StarredStream,
-    UserContributedToStream,
-    UserStream,
-)
-from tap_github.organization_streams import (
-    OrganizationStream,
-    TeamMembersStream,
-    TeamRolesStream,
-    TeamsStream,
-)
+from tap_github.user_streams import StarredStream, UserContributedToStream, UserStream
 
 
 class Streams(Enum):

tap_github/tap.py

@@ -1,9 +1,8 @@
 """GitHub tap class."""
 
-from typing import List
-
-import os
 import logging
+import os
+from typing import List
 
 from singer_sdk import Stream, Tap
 from singer_sdk import typing as th  # JSON schema typing helpers

tap_github/tests/fixtures.py

@@ -1,9 +1,10 @@
-import os
-import logging
 import datetime
+import logging
+import os
 import sys
 
 import pytest
+
 from ..utils.filter_stdout import FilterStdOutput
 
 # Filter out singer output during tests

tap_github/tests/test_core.py

@@ -1,22 +1,20 @@
 """Tests standard tap features using the built-in SDK tests library."""
-import os
 import logging
-
+import os
 from unittest import mock
 from unittest.mock import patch
 
-from tap_github.utils.filter_stdout import nostdout
-
-from .fixtures import alternative_sync_chidren
 from singer_sdk.testing import get_standard_tap_tests
 
 from tap_github.tap import TapGitHub
+from tap_github.utils.filter_stdout import nostdout
 
 from .fixtures import (
+    alternative_sync_chidren,
+    organization_list_config,
     repo_list_config,
     search_config,
     username_list_config,
-    organization_list_config,
 )
 
 

tap_github/tests/test_tap.py

@@ -1,12 +1,12 @@
-import os
 import logging
-import pytest
+import os
 from typing import Optional
-
 from unittest.mock import patch
 
-from singer_sdk.helpers._singer import Catalog
+import pytest
 from singer_sdk.helpers import _catalog as cat_helpers
+from singer_sdk.helpers._singer import Catalog
+
 from tap_github.tap import TapGitHub
 
 from .fixtures import alternative_sync_chidren, repo_list_config, username_list_config

tap_github/user_streams.py

@@ -1,7 +1,7 @@
 """User Stream types classes for tap-github."""
 
 import re
-from typing import Dict, List, Optional, Iterable, Any
+from typing import Any, Dict, Iterable, List, Optional
 
 from singer_sdk import typing as th  # JSON Schema typing helpers
 from singer_sdk.exceptions import FatalAPIError