python: Reorder imports with isort

Related to T2610

setup.py

@@ -4,10 +4,10 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from setuptools import setup, find_packages
-
-from os import path
 from io import open
+from os import path
+
+from setuptools import find_packages, setup
 
 here = path.abspath(path.dirname(__file__))
 

swh/lister/__init__.py

@@ -4,8 +4,8 @@
 # See top-level LICENSE file for more information
 
 import logging
-import pkg_resources
 
+import pkg_resources
 
 logger = logging.getLogger(__name__)
 

swh/lister/bitbucket/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import BitBucketModel
     from .lister import BitBucketLister
+    from .models import BitBucketModel
 
     return {
         "models": [BitBucketModel],

swh/lister/bitbucket/lister.py

@@ -3,18 +3,17 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-import logging
-import iso8601
-
 from datetime import datetime, timezone
+import logging
 from typing import Any, Dict, List, Optional
 from urllib import parse
+
+import iso8601
 from requests import Response
 
 from swh.lister.bitbucket.models import BitBucketModel
 from swh.lister.core.indexing_lister import IndexingHttpLister
 
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/bitbucket/models.py

@@ -2,7 +2,7 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from sqlalchemy import Column, String, DateTime
+from sqlalchemy import Column, DateTime, String
 
 from swh.lister.core.models import IndexingModelBase
 

swh/lister/bitbucket/tasks.py

@@ -3,6 +3,7 @@
 # See top-level LICENSE file for more information
 
 import random
+
 from celery import group, shared_task
 
 from .lister import BitBucketLister

swh/lister/bitbucket/tests/test_lister.py

@@ -3,10 +3,9 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from datetime import timedelta
 import re
 import unittest
-
-from datetime import timedelta
 from urllib.parse import unquote
 
 import iso8601

swh/lister/bitbucket/tests/test_tasks.py

@@ -4,10 +4,10 @@
 # See top-level LICENSE file for more information
 
 from time import sleep
-from celery.result import GroupResult
-
 from unittest.mock import patch
 
+from celery.result import GroupResult
+
 
 def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker):
     res = swh_scheduler_celery_app.send_task("swh.lister.bitbucket.tasks.ping")

swh/lister/cgit/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import CGitModel
     from .lister import CGitLister
+    from .models import CGitModel
 
     return {
         "models": [CGitModel],

swh/lister/cgit/lister.py

@@ -2,21 +2,20 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-import re
 import logging
-from urllib.parse import urlparse, urljoin
+import re
+from typing import Any, Dict, Generator, Optional
+from urllib.parse import urljoin, urlparse
 
 from bs4 import BeautifulSoup
 from requests import Session
-
 from requests.adapters import HTTPAdapter
-from typing import Any, Dict, Generator, Optional
-from .models import CGitModel
 
 from swh.core.utils import grouper
 from swh.lister import USER_AGENT
 from swh.lister.core.lister_base import ListerBase
 
+from .models import CGitModel
 
 logger = logging.getLogger(__name__)
 

swh/lister/cli.py

@@ -3,17 +3,17 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from copy import deepcopy
+import logging
+
 # WARNING: do not import unnecessary things here to keep cli startup time under
 # control
 import os
-import logging
-from copy import deepcopy
 
 import click
 
 from swh.core.cli import CONTEXT_SETTINGS
-from swh.lister import get_lister, SUPPORTED_LISTERS, LISTERS
-
+from swh.lister import LISTERS, SUPPORTED_LISTERS, get_lister
 
 logger = logging.getLogger(__name__)
 
@@ -82,6 +82,7 @@ def db_init(ctx, drop_tables):
 
     """
     from sqlalchemy import create_engine
+
     from swh.lister.core.models import initialize
 
     cfg = ctx.obj["config"]

swh/lister/core/indexing_lister.py

@@ -3,18 +3,17 @@
 # See top-level LICENSE file for more information
 
 import abc
-import logging
+from datetime import datetime
 from itertools import count
+import logging
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 import dateutil
+from requests import Response
 from sqlalchemy import func
 
-from .lister_transports import ListerHttpTransport
 from .lister_base import ListerBase
-
-from requests import Response
-from typing import Any, Dict, List, Tuple, Optional, Union
-from datetime import datetime
+from .lister_transports import ListerHttpTransport
 
 logger = logging.getLogger(__name__)
 

swh/lister/core/lister_base.py

@@ -10,10 +10,11 @@ import logging
 import os
 import re
 import time
+from typing import Any, Dict, List, Optional, Type, Union
 
+from requests import Response
 from sqlalchemy import create_engine, func
 from sqlalchemy.orm import sessionmaker
-from typing import Any, Dict, List, Type, Union, Optional
 
 from swh.core import config
 from swh.core.utils import grouper
@@ -21,8 +22,6 @@ from swh.scheduler import get_scheduler, utils
 
 from .abstractattribute import AbstractAttribute
 
-from requests import Response
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/core/lister_transports.py

@@ -3,24 +3,22 @@
 # See top-level LICENSE file for more information
 
 import abc
-import random
 from datetime import datetime
 from email.utils import parsedate
-from pprint import pformat
 import logging
+from pprint import pformat
+import random
+from typing import Any, Dict, List, Optional, Union
 
 import requests
-import xmltodict
-
-from typing import Optional, Union, Dict, Any, List
 from requests import Response
+import xmltodict
 
 from swh.lister import USER_AGENT_TEMPLATE, __version__
 
 from .abstractattribute import AbstractAttribute
 from .lister_base import FetchError
 
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/core/models.py

@@ -5,14 +5,13 @@
 import abc
 from datetime import datetime
 import logging
+from typing import Type, Union
 
 from sqlalchemy import Column, DateTime, Integer, String
 from sqlalchemy.ext.declarative import DeclarativeMeta, declarative_base
-from typing import Type, Union
 
 from .abstractattribute import AbstractAttribute
 
-
 SQLBase = declarative_base()
 
 

swh/lister/core/page_by_page_lister.py

@@ -5,8 +5,8 @@
 import abc
 import logging
 
-from .lister_transports import ListerHttpTransport
 from .lister_base import ListerBase
+from .lister_transports import ListerHttpTransport
 
 
 class PageByPageLister(ListerBase):

swh/lister/core/simple_lister.py

@@ -4,12 +4,11 @@
 # See top-level LICENSE file for more information
 
 import logging
-
 from typing import Any, List
 
 from swh.core import utils
-from .lister_base import ListerBase
 
+from .lister_base import ListerBase
 
 logger = logging.getLogger(__name__)
 

swh/lister/core/tests/test_abstractattribute.py

@@ -3,9 +3,8 @@
 # See top-level LICENSE file for more information
 
 import abc
-import unittest
-
 from typing import Any
+import unittest
 
 from swh.lister.core.abstractattribute import AbstractAttribute
 

swh/lister/core/tests/test_lister.py

@@ -5,12 +5,12 @@
 import abc
 import datetime
 import time
+from typing import Any, Callable, Optional, Pattern, Type, Union
 from unittest import TestCase
 from unittest.mock import Mock, patch
 
 import requests_mock
 from sqlalchemy import create_engine
-from typing import Any, Callable, Optional, Pattern, Type, Union
 
 import swh.lister
 from swh.lister.core.abstractattribute import AbstractAttribute

swh/lister/cran/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import CRANModel
     from .lister import CRANLister
+    from .models import CRANModel
 
     return {
         "models": [CRANModel],

swh/lister/cran/lister.py

@@ -5,17 +5,15 @@
 
 import json
 import logging
-import pkg_resources
 import subprocess
-
 from typing import List, Mapping, Tuple
 
-from swh.lister.cran.models import CRANModel
+import pkg_resources
 
 from swh.lister.core.simple_lister import SimpleLister
+from swh.lister.cran.models import CRANModel
 from swh.scheduler.utils import create_task_dict
 
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/cran/tests/test_lister.py

@@ -4,12 +4,12 @@
 # See top-level LICENSE file for more information
 
 import json
-import pytest
-
 from os import path
 from unittest.mock import patch
 
-from swh.lister.cran.lister import compute_origin_urls, CRAN_MIRROR
+import pytest
+
+from swh.lister.cran.lister import CRAN_MIRROR, compute_origin_urls
 
 
 def test_cran_compute_origin_urls():

swh/lister/debian/__init__.py

@@ -4,10 +4,8 @@
 # See top-level LICENSE file for more information
 
 import logging
-
 from typing import Any, List, Mapping
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -28,9 +26,10 @@ def debian_init(
         components: Default components to register per suite
 
     """
-    from swh.lister.debian.models import Distribution, Area
     from sqlalchemy.orm import sessionmaker
 
+    from swh.lister.debian.models import Area, Distribution
+
     db_session = sessionmaker(bind=db_engine)()
     distrib = (
         db_session.query(Distribution)

swh/lister/debian/lister.py

@@ -7,15 +7,17 @@ import bz2
 from collections import defaultdict
 import datetime
 import gzip
-import lzma
 import logging
+import lzma
+from typing import Any, Dict, Mapping, Optional
 
 from debian.deb822 import Sources
+from requests import Response
 from sqlalchemy.orm import joinedload, load_only
 from sqlalchemy.schema import CreateTable, DropTable
-from typing import Mapping, Optional, Dict, Any
-from requests import Response
 
+from swh.lister.core.lister_base import FetchError, ListerBase
+from swh.lister.core.lister_transports import ListerHttpTransport
 from swh.lister.debian.models import (
     AreaSnapshot,
     Distribution,
@@ -24,9 +26,6 @@ from swh.lister.debian.models import (
     TempPackage,
 )
 
-from swh.lister.core.lister_base import ListerBase, FetchError
-from swh.lister.core.lister_transports import ListerHttpTransport
-
 decompressors = {
     "gz": lambda f: gzip.GzipFile(fileobj=f),
     "bz2": bz2.BZ2File,

swh/lister/debian/models.py

@@ -6,6 +6,7 @@
 import binascii
 from collections import defaultdict
 import datetime
+from typing import Any, Mapping
 
 from sqlalchemy import (
     Boolean,
@@ -19,7 +20,6 @@ from sqlalchemy import (
     Table,
     UniqueConstraint,
 )
-from typing import Any, Mapping
 
 try:
     from sqlalchemy import JSON

swh/lister/debian/tests/conftest.py

@@ -4,7 +4,6 @@
 # See top-level LICENSE file for more information
 
 import pytest
-
 from pytest_postgresql.janitor import DatabaseJanitor
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker

swh/lister/debian/tests/test_init.py

@@ -6,8 +6,7 @@
 import pytest
 
 from swh.lister.debian import debian_init
-
-from swh.lister.debian.models import Distribution, Area
+from swh.lister.debian.models import Area, Distribution
 
 
 @pytest.fixture

swh/lister/debian/tests/test_lister.py

@@ -5,7 +5,6 @@
 
 import logging
 
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/debian/tests/test_models.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from swh.lister.debian.models import Distribution, Area
+from swh.lister.debian.models import Area, Distribution
 
 
 def test_area_index_uris_deb(session):

swh/lister/debian/utils.py

@@ -6,8 +6,8 @@ import logging
 
 import click
 
-from swh.lister.debian.models import Distribution, Area, SQLBase
 from swh.lister.debian.lister import DebianLister
+from swh.lister.debian.models import Area, Distribution, SQLBase
 
 
 @click.group()

swh/lister/gitea/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import GiteaModel
     from .lister import GiteaLister
+    from .models import GiteaModel
 
     return {
         "models": [GiteaModel],

swh/lister/gitea/lister.py

@@ -3,14 +3,15 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+import re
+from typing import Any, Dict, List, MutableMapping, Optional, Tuple
+
+from requests import Response
+from urllib3.util import parse_url
+
 from ..core.page_by_page_lister import PageByPageHttpLister
 from .models import GiteaModel
 
-from typing import Any, Dict, List, Tuple, MutableMapping, Optional
-from requests import Response
-import re
-from urllib3.util import parse_url
-
 
 class GiteaLister(PageByPageHttpLister):
     # Template path expecting an integer that represents the page id

swh/lister/gitea/tasks.py

@@ -9,7 +9,6 @@ from celery import group, shared_task
 from .. import utils
 from .lister import GiteaLister
 
-
 NBPAGES = 10
 
 

swh/lister/gitea/tests/test_tasks.py

@@ -4,9 +4,9 @@
 # See top-level LICENSE file for more information
 
 from time import sleep
+from unittest.mock import call, patch
 
 from celery.result import GroupResult
-from unittest.mock import patch, call
 
 from swh.lister.gitea.tasks import NBPAGES
 from swh.lister.utils import split_range

swh/lister/github/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import GitHubModel
     from .lister import GitHubLister
+    from .models import GitHubModel
 
     return {
         "models": [GitHubModel],

swh/lister/github/lister.py

@@ -4,14 +4,13 @@
 # See top-level LICENSE file for more information
 
 import re
+from typing import Any, Dict, List, Optional, Tuple
 
-from typing import Any, Dict, List, Tuple, Optional
+from requests import Response
 
 from swh.lister.core.indexing_lister import IndexingHttpLister
 from swh.lister.github.models import GitHubModel
 
-from requests import Response
-
 
 class GitHubLister(IndexingHttpLister):
     PATH_TEMPLATE = "/repositories?since=%d"

swh/lister/github/models.py

@@ -2,7 +2,7 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from sqlalchemy import Column, Boolean, Integer
+from sqlalchemy import Boolean, Column, Integer
 
 from swh.lister.core.models import IndexingModelBase
 

swh/lister/github/tests/test_tasks.py

@@ -1,8 +1,8 @@
 from time import sleep
-from celery.result import GroupResult
-
 from unittest.mock import patch
 
+from celery.result import GroupResult
+
 
 def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker):
     res = swh_scheduler_celery_app.send_task("swh.lister.github.tasks.ping")

swh/lister/gitlab/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import GitLabModel
     from .lister import GitLabLister
+    from .models import GitLabModel
 
     return {
         "models": [GitLabModel],

swh/lister/gitlab/lister.py

@@ -4,14 +4,14 @@
 # See top-level LICENSE file for more information
 
 import time
+from typing import Any, Dict, List, MutableMapping, Optional, Tuple, Union
+
+from requests import Response
 from urllib3.util import parse_url
 
 from ..core.page_by_page_lister import PageByPageHttpLister
 from .models import GitLabModel
 
-from typing import Any, Dict, List, Tuple, Union, MutableMapping, Optional
-from requests import Response
-
 
 class GitLabLister(PageByPageHttpLister):
     # Template path expecting an integer that represents the page id

swh/lister/gitlab/tasks.py

@@ -9,7 +9,6 @@ from celery import group, shared_task
 from .. import utils
 from .lister import GitLabLister
 
-
 NBPAGES = 10
 
 

swh/lister/gitlab/tests/test_lister.py

@@ -3,18 +3,16 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from datetime import datetime, timedelta
 import logging
 import re
 import unittest
 
-from datetime import datetime, timedelta
-
 import pytest
 
 from swh.lister.core.tests.test_lister import HttpListerTesterBase
 from swh.lister.gitlab.lister import GitLabLister
 
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/gitlab/tests/test_tasks.py

@@ -4,9 +4,9 @@
 # See top-level LICENSE file for more information
 
 from time import sleep
+from unittest.mock import call, patch
 
 from celery.result import GroupResult
-from unittest.mock import patch, call
 
 from swh.lister.gitea.tasks import NBPAGES
 from swh.lister.utils import split_range

swh/lister/gnu/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import GNUModel
     from .lister import GNULister
+    from .models import GNUModel
 
     return {
         "models": [GNUModel],

swh/lister/gnu/lister.py

@@ -3,15 +3,14 @@
 # See top-level LICENSE file for more information
 
 import logging
+from typing import Any, Dict, List
+
+from requests import Response
 
-from swh.scheduler import utils
 from swh.lister.core.simple_lister import SimpleLister
-
 from swh.lister.gnu.models import GNUModel
 from swh.lister.gnu.tree import GNUTree
-
-from typing import Any, Dict, List
-from requests import Response
+from swh.scheduler import utils
 
 logger = logging.getLogger(__name__)
 

swh/lister/gnu/tests/test_lister.py

@@ -7,7 +7,6 @@ import logging
 
 import pytest
 
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/gnu/tests/test_tree.py

@@ -4,17 +4,17 @@
 # See top-level LICENSE file for more information
 
 import json
+from os import path
 
 import pytest
 
-from os import path
 from swh.lister.gnu.tree import (
     GNUTree,
-    find_artifacts,
     check_filename_is_archive,
-    load_raw_data,
-    get_version,
+    find_artifacts,
     format_date,
+    get_version,
+    load_raw_data,
 )
 
 

swh/lister/gnu/tree.py

@@ -3,19 +3,18 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from datetime import datetime
 import gzip
 import json
 import logging
-import requests
-import re
-
-from datetime import datetime
 from os import path
 from pathlib import Path
-from pytz import utc
+import re
 from typing import Any, List, Mapping, Sequence, Tuple
 from urllib.parse import urlparse
 
+from pytz import utc
+import requests
 
 logger = logging.getLogger(__name__)
 

swh/lister/launchpad/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import LaunchpadModel
     from .lister import LaunchpadLister
+    from .models import LaunchpadModel
 
     return {
         "models": [LaunchpadModel],

swh/lister/launchpad/lister.py

@@ -3,17 +3,18 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from typing import Optional, Dict, List, Union, Tuple, Any
-
-from swh.lister.core.lister_base import ListerBase
-from .models import LaunchpadModel
-
+from datetime import datetime, timedelta
 from itertools import count
+from typing import Any, Dict, List, Optional, Tuple, Union
+
 from launchpadlib.launchpad import Launchpad  # type: ignore
 from lazr.restfulclient.resource import Collection, Entry  # type: ignore
-from datetime import datetime, timedelta
 from sqlalchemy import func
 
+from swh.lister.core.lister_base import ListerBase
+
+from .models import LaunchpadModel
+
 
 class LaunchpadLister(ListerBase):
     MODEL = LaunchpadModel

swh/lister/launchpad/models.py

@@ -2,7 +2,7 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from sqlalchemy import Column, String, Date
+from sqlalchemy import Column, Date, String
 
 from swh.lister.core.models import ModelBase
 

swh/lister/launchpad/tests/conftest.py

@@ -7,10 +7,12 @@ from datetime import datetime
 import json
 import os
 from unittest.mock import patch
+
 import pytest
+from sqlalchemy.engine import create_engine
+
 from swh.lister import get_lister
 from swh.lister.core.models import initialize
-from sqlalchemy.engine import create_engine
 
 
 @pytest.fixture

swh/lister/npm/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import NpmVisitModel, NpmModel
     from .lister import NpmLister
+    from .models import NpmModel, NpmVisitModel
 
     return {
         "models": [NpmVisitModel, NpmModel],

swh/lister/npm/lister.py

@@ -2,13 +2,14 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from typing import Any, Dict, List, Optional
+
+from requests import Response
+
 from swh.lister.core.indexing_lister import IndexingHttpLister
 from swh.lister.npm.models import NpmModel
 from swh.scheduler.utils import create_task_dict
 
-from typing import Any, Dict, Optional, List
-from requests import Response
-
 
 class NpmListerBase(IndexingHttpLister):
     """List packages available in the npm registry in a paginated way

swh/lister/npm/models.py

@@ -2,9 +2,9 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from sqlalchemy import Column, String, DateTime, Integer, BigInteger, Sequence
+from sqlalchemy import BigInteger, Column, DateTime, Integer, Sequence, String
 
-from swh.lister.core.models import IndexingModelBase, SQLBase, ABCSQLMeta
+from swh.lister.core.models import ABCSQLMeta, IndexingModelBase, SQLBase
 
 
 class NpmVisitModel(SQLBase, metaclass=ABCSQLMeta):

swh/lister/npm/tasks.py

@@ -2,12 +2,12 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from datetime import datetime
 from contextlib import contextmanager
+from datetime import datetime
 
 from celery import shared_task
 
-from swh.lister.npm.lister import NpmLister, NpmIncrementalLister
+from swh.lister.npm.lister import NpmIncrementalLister, NpmLister
 from swh.lister.npm.models import NpmVisitModel
 
 

swh/lister/npm/tests/test_lister.py

@@ -4,16 +4,14 @@
 # See top-level LICENSE file for more information
 
 import logging
-
 import re
-import requests_mock
+from typing import Any, List
 import unittest
 
+import requests_mock
+
 from swh.lister.core.tests.test_lister import HttpListerTesterBase
-from swh.lister.npm.lister import NpmLister, NpmIncrementalLister
-
-from typing import Any, List
-
+from swh.lister.npm.lister import NpmIncrementalLister, NpmLister
 
 logger = logging.getLogger(__name__)
 

swh/lister/packagist/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import PackagistModel
     from .lister import PackagistLister
+    from .models import PackagistModel
 
     return {
         "models": [PackagistModel],

swh/lister/packagist/lister.py

@@ -6,16 +6,14 @@
 import json
 import logging
 import random
-
 from typing import Any, Dict, List, Mapping
 
-from swh.scheduler import utils
-from swh.lister.core.simple_lister import SimpleLister
 from swh.lister.core.lister_transports import ListerOnePageApiTransport
+from swh.lister.core.simple_lister import SimpleLister
+from swh.scheduler import utils
 
 from .models import PackagistModel
 
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/packagist/tests/test_lister.py

@@ -4,13 +4,12 @@
 # See top-level LICENSE file for more information
 
 import unittest
-import requests_mock
-
 from unittest.mock import patch
 
-from swh.lister.packagist.lister import PackagistLister, compute_package_url
-from swh.lister.core.tests.test_lister import HttpSimpleListerTester
+import requests_mock
 
+from swh.lister.core.tests.test_lister import HttpSimpleListerTester
+from swh.lister.packagist.lister import PackagistLister, compute_package_url
 
 expected_packages = [
     "0.0.0/composer-include-files",

swh/lister/phabricator/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import PhabricatorModel
     from .lister import PhabricatorLister
+    from .models import PhabricatorModel
 
     return {
         "models": [PhabricatorModel],

swh/lister/phabricator/lister.py

@@ -2,21 +2,18 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
+from collections import defaultdict
 import logging
 import random
-
+from typing import Any, Dict, List, Optional
 import urllib.parse
 
-from collections import defaultdict
-
+from requests import Response
 from sqlalchemy import func
 
 from swh.lister.core.indexing_lister import IndexingHttpLister
 from swh.lister.phabricator.models import PhabricatorModel
 
-from typing import Any, Dict, List, Optional
-from requests import Response
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/phabricator/models.py

@@ -2,7 +2,7 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-from sqlalchemy import Column, String, Integer
+from sqlalchemy import Column, Integer, String
 
 from swh.lister.core.models import IndexingModelBase
 

swh/lister/phabricator/tests/test_lister.py

@@ -3,17 +3,15 @@
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
-import re
 import json
 import logging
+import re
 import unittest
 
 import requests_mock
 
 from swh.lister.core.tests.test_lister import HttpListerTester
-from swh.lister.phabricator.lister import PhabricatorLister
-from swh.lister.phabricator.lister import get_repo_url
-
+from swh.lister.phabricator.lister import PhabricatorLister, get_repo_url
 
 logger = logging.getLogger(__name__)
 

swh/lister/pypi/__init__.py

@@ -4,8 +4,8 @@
 
 
 def register():
-    from .models import PyPIModel
     from .lister import PyPILister
+    from .models import PyPIModel
 
     return {
         "models": [PyPIModel],

swh/lister/pypi/lister.py

@@ -4,16 +4,16 @@
 # See top-level LICENSE file for more information
 
 import random
+from typing import Any, Dict
+
+from requests import Response
 import xmltodict
 
-from .models import PyPIModel
-
-from swh.scheduler import utils
-from swh.lister.core.simple_lister import SimpleLister
 from swh.lister.core.lister_transports import ListerOnePageApiTransport
+from swh.lister.core.simple_lister import SimpleLister
+from swh.scheduler import utils
 
-from typing import Any, Dict
-from requests import Response
+from .models import PyPIModel
 
 
 class PyPILister(ListerOnePageApiTransport, SimpleLister):

swh/lister/pytest_plugin.py

@@ -6,13 +6,11 @@
 import logging
 
 import pytest
-
 from sqlalchemy import create_engine
 
-from swh.lister import get_lister, SUPPORTED_LISTERS
+from swh.lister import SUPPORTED_LISTERS, get_lister
 from swh.lister.core.models import initialize
 
-
 logger = logging.getLogger(__name__)
 
 

swh/lister/tests/test_cli.py

@@ -5,9 +5,8 @@
 
 import pytest
 
-
+from swh.lister.cli import SUPPORTED_LISTERS, get_lister
 from swh.lister.core.lister_base import ListerBase
-from swh.lister.cli import get_lister, SUPPORTED_LISTERS
 
 from .test_utils import init_db
 

swh/lister/tests/test_utils.py

@@ -3,7 +3,6 @@
 # See top-level LICENSE file for more information
 
 import pytest
-
 from testing.postgresql import Postgresql
 
 from swh.lister import utils