diff --git a/pipenv/cli.py b/pipenv/cli.py index 529cf249..ff9a55cf 100644 --- a/pipenv/cli.py +++ b/pipenv/cli.py @@ -322,11 +322,10 @@ def run(command, args, three=None, python=False): @click.option('--python', default=False, nargs=1, help="Specify which version of Python virtualenv should use.") @click.option('--system', is_flag=True, default=False, help="Use system Python.") @click.option('--unused', nargs=1, default=False, help="Given a code path, show potentially unused dependencies.") -@click.option('--style', nargs=1, default=False, help="Given a code path, show Flake8 errors.") @click.argument('args', nargs=-1) def check(three=None, python=False, system=False, unused=False, style=False, args=None): from . import core - core.do_check(three=three, python=python, system=system, unused=unused, style=style, args=args) + core.do_check(three=three, python=python, system=system, unused=unused, args=args) @click.command(short_help=u"Displays currently–installed dependency graph information.") diff --git a/pipenv/core.py b/pipenv/core.py index 5828514a..bece439f 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -25,7 +25,6 @@ import requests import pipfile import pipdeptree import semver -import flake8.main.cli from pipreqs import pipreqs from blindspin import spinner from urllib3.exceptions import InsecureRequestWarning @@ -2069,7 +2068,7 @@ def do_run(command, args, three=None, python=False): pass -def do_check(three=None, python=False, system=False, unused=False, style=False, args=None): +def do_check(three=None, python=False, system=False, unused=False, args=None): if not system: # Ensure that virtualenv is available. @@ -2078,16 +2077,6 @@ def do_check(three=None, python=False, system=False, unused=False, style=False, if not args: args = [] - if style: - click.echo( - '{0}: --style argument is deprecated since 9.1.0 and will be ' - 'removed in 10.0.0.'.format(crayons.red('Warning', bold=True)), - err=True - ) - sys.argv = ['magic', project.path_to(style)] + list(args) - flake8.main.cli.main() - exit() - if unused: deps_required = [k for k in project.packages.keys()] deps_needed = import_from_code(unused) diff --git a/setup.py b/setup.py index f262dfae..77c8e1d9 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,6 @@ required = [ 'pew>=0.1.26', 'pip>=9.0.1', 'requests>2.18.0', - 'flake8>=3.0.0', 'urllib3>=1.21.1' ] diff --git a/tests/test_pipenv.py b/tests/test_pipenv.py index 416ab816..0193090c 100644 --- a/tests/test_pipenv.py +++ b/tests/test_pipenv.py @@ -786,19 +786,6 @@ requests = {version = "*"} assert 'GitPython' not in c.out assert 'tablib' in c.out - @pytest.mark.check - @pytest.mark.style - def test_flake8(self): - - with PipenvInstance() as p: - - with PipenvInstance(chdir=True) as p: - with open('t.py', 'w') as f: - f.write('import requests') - - c = p.pipenv('check --style .') - assert 'requests' in c.out - @pytest.mark.extras @pytest.mark.install @pytest.mark.requirements