Skip to content

Commit

Permalink
Sort imports and add isort as a check.
Browse files Browse the repository at this point in the history
  • Loading branch information
ionelmc committed Oct 3, 2019
1 parent a4d952d commit 5f70ec4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
from __future__ import absolute_import, print_function
from __future__ import absolute_import
from __future__ import print_function

import io
from itertools import chain
import re
from distutils.command.build import build
from glob import glob
from itertools import chain
from os.path import basename
from os.path import dirname
from os.path import join
from os.path import splitext
from distutils.command.build import build

from setuptools import Command
from setuptools import find_packages
from setuptools import setup
from setuptools.command.develop import develop
from setuptools.command.install_lib import install_lib
from setuptools.command.easy_install import easy_install
from setuptools.command.install_lib import install_lib


def read(*names, **kwargs):
Expand Down
5 changes: 3 additions & 2 deletions src/pytest_cov/engine.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Coverage controllers for use by pytest-cov and nose-cov."""

import contextlib
import copy
import os
Expand All @@ -10,8 +9,10 @@
import coverage
from coverage.data import CoverageData

from .compat import StringIO
from .compat import workerinput
from .compat import workeroutput
from .embed import cleanup
from .compat import StringIO, workeroutput, workerinput


class _NullFile(object):
Expand Down
5 changes: 3 additions & 2 deletions src/pytest_cov/plugin.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
"""Coverage plugin for pytest."""
import argparse
import coverage
import os
import pytest
import warnings

import coverage
import pytest
from coverage.misc import CoverageException

from . import compat
Expand Down
6 changes: 3 additions & 3 deletions tests/test_pytest_cov.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
from process_tests import wait_for_strings
from six import exec_

import pytest_cov.plugin
from pytest_cov import compat

try:
from StringIO import StringIO
except ImportError:
from io import StringIO

import pytest_cov.plugin
from pytest_cov import compat

coverage, platform # required for skipif mark on test_cov_min_from_coveragerc

max_worker_restart_0 = "--max-" + compat.worker + "-restart=0"
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ deps =
flake8
readme-renderer
pygments
isort
skip_install = true
usedevelop = false
commands =
python setup.py check --strict --metadata --restructuredtext
check-manifest {toxinidir}
flake8 src tests setup.py
isort --check-only --diff --recursive src tests setup.py

0 comments on commit 5f70ec4

Please sign in to comment.