Unverified Commit dd6c674e authored by Felix Hildén's avatar Felix Hildén Committed by GitHub
Browse files

Use setuptools.find_packages in setup (#2363)

* Use setuptools.find_packages in setup

* Address mypy errors
parent ae56983a
Loading
Loading
Loading
Loading
+2 −2
Changes for setup.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
# Copyright (C) 2020 Łukasz Langa
from setuptools import setup
from setuptools import setup, find_packages
import sys
import os

@@ -62,7 +62,7 @@ def get_long_description() -> str:
    license="MIT",
    py_modules=["_black_version"],
    ext_modules=ext_modules,
    packages=["blackd", "black", "blib2to3", "blib2to3.pgen2", "black_primer"],
    packages=find_packages(where="src"),
    package_dir={"": "src"},
    package_data={
        "blib2to3": ["*.txt"],
+0 −0

Empty file added.

+3 −3
Changes for src/black_primer/cli.py: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
from pathlib import Path
from shutil import rmtree, which
from tempfile import gettempdir
from typing import Any, Union
from typing import Any, Union, Optional

import click

@@ -29,8 +29,8 @@


def _handle_debug(
    ctx: click.core.Context,
    param: Union[click.core.Option, click.core.Parameter],
    ctx: Optional[click.core.Context],
    param: Optional[Union[click.core.Option, click.core.Parameter]],
    debug: Union[bool, int, str],
) -> Union[bool, int, str]:
    """Turn on debugging if asked otherwise INFO default"""
+2 −2
Changes for tests/test_primer.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ def test_process_queue(self, mock_stdout: Mock) -> None:
        with patch("black_primer.lib.git_checkout_or_rebase", return_false):
            with TemporaryDirectory() as td:
                return_val = loop.run_until_complete(
                    lib.process_queue(str(config_path), td, 2)
                    lib.process_queue(str(config_path), Path(td), 2)
                )
                self.assertEqual(0, return_val)

@@ -210,7 +210,7 @@ def test_async_main(self) -> None:
            "no_diff": False,
        }
        with patch("black_primer.cli.lib.process_queue", return_zero):
            return_val = loop.run_until_complete(cli.async_main(**args))
            return_val = loop.run_until_complete(cli.async_main(**args))  # type: ignore
            self.assertEqual(0, return_val)

    def test_handle_debug(self) -> None: