From d14b24ce56c8240fdf28081fc60c70a6955c88d8 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Nov 22 2018 10:22:55 +0000 Subject: pep8: reorder imports Adds noqa: I100 to project-internal non-relative imports in tests so they can be ordered last. --- diff --git a/_fedmod/_fetchrepodata.py b/_fedmod/_fetchrepodata.py index c69a602..6b333bd 100644 --- a/_fedmod/_fetchrepodata.py +++ b/_fedmod/_fetchrepodata.py @@ -5,18 +5,21 @@ import logging import os import re from collections import defaultdict +from urllib.parse import urljoin + +from attr import attrib, attributes import click -import requests import gi gi.require_version('Modulemd', '1.0') from gi.repository import Modulemd -from attr import attributes, attrib from lxml import etree + +import requests + from requests_toolbelt.downloadutils.tee import tee_to_file -from urllib.parse import urljoin from .config import config diff --git a/_fedmod/_repodata.py b/_fedmod/_repodata.py index f21fc20..9adf965 100644 --- a/_fedmod/_repodata.py +++ b/_fedmod/_repodata.py @@ -1,12 +1,13 @@ """_repodata: Resolve module relationship queries against the local cache""" +import logging +import os.path import sys import tempfile -import os.path -import logging + import solv -from .config import config from ._fetchrepodata import load_cached_repodata, parse_dataset_name +from .config import config log = logging.getLogger(__name__) diff --git a/_fedmod/cli.py b/_fedmod/cli.py index 3eb645b..b08d7b0 100644 --- a/_fedmod/cli.py +++ b/_fedmod/cli.py @@ -1,7 +1,11 @@ +import logging import sys + import click import click_completion -import logging + +from . import _fetchrepodata, _repodata +from . import modulemd_linter as mmdl from .config import config from .flatpak_generator import FlatpakGenerator, do_flatpak_report @@ -9,9 +13,6 @@ from .module_generator import ModuleGenerator from .module_repoquery import ModuleRepoquery from .modulemd_summarizer import summarize_modules -from . import modulemd_linter as mmdl -from . import _repodata, _fetchrepodata - # fedmod uses click for argument parsing, but currently does its own # standardised exception handling. This also requires handling click's standard # exception types as described in http://click.pocoo.org/5/exceptions/ diff --git a/_fedmod/flatpak_generator.py b/_fedmod/flatpak_generator.py index db53710..d28180b 100644 --- a/_fedmod/flatpak_generator.py +++ b/_fedmod/flatpak_generator.py @@ -1,18 +1,19 @@ -import click import json -import sys import os +import sys from textwrap import dedent +import click + import gi gi.require_version('Modulemd', '1.0') from gi.repository import Modulemd +from . import _depchase from ._repodata import dataset_release_name from .get_module_builds import get_module_builds from .module_generator import ModuleGenerator from .util import rpm_name_only -from . import _depchase def dataset_release_branch(): release_name = dataset_release_name() diff --git a/_fedmod/get_module_builds.py b/_fedmod/get_module_builds.py index ddb65c9..6ac4b58 100644 --- a/_fedmod/get_module_builds.py +++ b/_fedmod/get_module_builds.py @@ -1,6 +1,7 @@ -import koji import re +import koji + FEDORA_TAG_PATTERNS = [(re.compile(p), s) for p, s in [ (r'^(f\d+)-modular$', 'stable'), (r'^(f\d+)-modular-pending$', 'pending'), diff --git a/_fedmod/modulemd_summarizer.py b/_fedmod/modulemd_summarizer.py index f074c69..eb8e258 100644 --- a/_fedmod/modulemd_summarizer.py +++ b/_fedmod/modulemd_summarizer.py @@ -20,14 +20,14 @@ # Author: # Rafael dos Santos -import smartcols - import gi gi.require_version('Modulemd', '1.0') from gi.repository import Modulemd -from ._repodata import get_dataset +import smartcols + from ._fetchrepodata import merge_modules +from ._repodata import get_dataset def print_summary(profiles, sdefaults=None, pdefaults=None, restrict_to=None): diff --git a/setup.py b/setup.py index 4e3559c..a092ce6 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup( name='fedmod', diff --git a/tests/test_cli_ux.py b/tests/test_cli_ux.py index 9507c78..f37b52f 100644 --- a/tests/test_cli_ux.py +++ b/tests/test_cli_ux.py @@ -1,13 +1,14 @@ """Tests for the general behaviour of the CLI""" -import pytest import json import os import re -import sys import subprocess +import sys + +import pytest -from _fedmod._fetchrepodata import CACHEDIR +from _fedmod._fetchrepodata import CACHEDIR # noqa: I100 def _run_fedmod(args): # Run via the -m switch to ensure we get the expected version of fedmod diff --git a/tests/test_flatpak_generator.py b/tests/test_flatpak_generator.py index 444206b..6118cc7 100644 --- a/tests/test_flatpak_generator.py +++ b/tests/test_flatpak_generator.py @@ -2,18 +2,18 @@ import logging import os -import pytest import tempfile -import yaml from click.testing import CliRunner import gi - gi.require_version('Modulemd', '1.0') from gi.repository import Modulemd -from _fedmod.cli import _cli_commands +import pytest +import yaml + +from _fedmod.cli import _cli_commands # noqa: I100 log = logging.getLogger(__name__) diff --git a/tests/test_flatpak_report.py b/tests/test_flatpak_report.py index 7fdd860..6ac3161 100644 --- a/tests/test_flatpak_report.py +++ b/tests/test_flatpak_report.py @@ -2,11 +2,12 @@ import json import logging -import pytest from click.testing import CliRunner -from _fedmod.cli import _cli_commands +import pytest + +from _fedmod.cli import _cli_commands # noqa: I100 log = logging.getLogger(__name__) diff --git a/tests/test_module_generator.py b/tests/test_module_generator.py index 8e67328..27349ff 100644 --- a/tests/test_module_generator.py +++ b/tests/test_module_generator.py @@ -1,13 +1,14 @@ """In-process tests for the modulemd generator""" -import pytest from click.testing import CliRunner import gi gi.require_version('Modulemd', '1.0') from gi.repository import Modulemd -from _fedmod.cli import _cli_commands +import pytest + +from _fedmod.cli import _cli_commands # noqa: I100 def _generate_modulemd(rpms): cmd = ['rpm2module'] diff --git a/tests/test_module_repoquery.py b/tests/test_module_repoquery.py index 66e842f..6ae3e1b 100644 --- a/tests/test_module_repoquery.py +++ b/tests/test_module_repoquery.py @@ -1,7 +1,8 @@ """In-process tests for the repo metadata querying functionality""" import pytest -from _fedmod.module_repoquery import ModuleRepoquery + +from _fedmod.module_repoquery import ModuleRepoquery # noqa: I100 @pytest.mark.needs_metadata class TestListingModules(object): diff --git a/tests/test_module_summary.py b/tests/test_module_summary.py index 5717b5b..e758293 100644 --- a/tests/test_module_summary.py +++ b/tests/test_module_summary.py @@ -1,9 +1,11 @@ """In-process tests for the module summary functionality""" +import os.path import re + import pytest -import os.path -from _fedmod.modulemd_summarizer import summarize_modules + +from _fedmod.modulemd_summarizer import summarize_modules # noqa: I100 testfiles_dir = os.path.join(os.path.dirname(__file__), 'files')