From 2445068b72aa32e5342aa3ef3b456a502f317bab Mon Sep 17 00:00:00 2001 From: hauntsaninja <> Date: Mon, 20 Jan 2020 00:05:09 -0600 Subject: [PATCH 1/3] distutils: various fixes - fix parameter name in `move_file` - make `setup` keyword-only args keyword-only - add undocumented (positional!) `swig_opts` parameter to `Extension` --- stdlib/2and3/distutils/cmd.pyi | 2 +- stdlib/2and3/distutils/core.pyi | 4 +++- stdlib/2and3/distutils/extension.pyi | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stdlib/2and3/distutils/cmd.pyi b/stdlib/2and3/distutils/cmd.pyi index 2ec5a5089420..92dc70bbd81f 100644 --- a/stdlib/2and3/distutils/cmd.pyi +++ b/stdlib/2and3/distutils/cmd.pyi @@ -34,7 +34,7 @@ class Command: def mkpath(self, name: str, mode: int = ...) -> None: ... def copy_file(self, infile: str, outfile: str, preserve_mode: int = ..., preserve_times: int = ..., link: Optional[str] = ..., level: Any = ...) -> Tuple[str, bool]: ... # level is not used def copy_tree(self, infile: str, outfile: str, preserve_mode: int = ..., preserve_times: int = ..., preserve_symlinks: int = ..., level: Any = ...) -> List[str]: ... # level is not used - def move_file(self, src: str, dest: str, level: Any = ...) -> str: ... # level is not used + def move_file(self, src: str, dst: str, level: Any = ...) -> str: ... # level is not used def spawn(self, cmd: Iterable[str], search_path: int = ..., level: Any = ...) -> None: ... # level is not used def make_archive(self, base_name: str, format: str, root_dir: Optional[str] = ..., base_dir: Optional[str] = ..., owner: Optional[str] = ..., group: Optional[str] = ...) -> str: ... def make_file(self, infiles: Union[str, List[str], Tuple[str]], outfile: str, func: Callable[..., Any], args: List[Any], exec_msg: Optional[str] = ..., skip_msg: Optional[str] = ..., level: Any = ...) -> None: ... # level is not used diff --git a/stdlib/2and3/distutils/core.pyi b/stdlib/2and3/distutils/core.pyi index 125b79992219..52d5c0da3350 100644 --- a/stdlib/2and3/distutils/core.pyi +++ b/stdlib/2and3/distutils/core.pyi @@ -5,7 +5,9 @@ from distutils.cmd import Command as Command from distutils.dist import Distribution as Distribution from distutils.extension import Extension as Extension -def setup(name: str = ..., +def setup( + *, + name: str = ..., version: str = ..., description: str = ..., long_description: str = ..., diff --git a/stdlib/2and3/distutils/extension.pyi b/stdlib/2and3/distutils/extension.pyi index 5aa070e43061..537e983967c2 100644 --- a/stdlib/2and3/distutils/extension.pyi +++ b/stdlib/2and3/distutils/extension.pyi @@ -18,6 +18,7 @@ class Extension: extra_compile_args: List[str] = ..., extra_link_args: List[str] = ..., export_symbols: List[str] = ..., + swig_opts: Optional[str] = ..., # undocumented depends: List[str] = ..., language: str = ..., optional: bool = ...) -> None: ... @@ -35,5 +36,6 @@ class Extension: extra_compile_args: List[str] = ..., extra_link_args: List[str] = ..., export_symbols: List[str] = ..., + swig_opts: Optional[str] = ..., # undocumented depends: List[str] = ..., language: str = ...) -> None: ... From b85e1702ee99338cad9e943585a52707259b2d20 Mon Sep 17 00:00:00 2001 From: hauntsaninja <> Date: Mon, 20 Jan 2020 13:03:50 -0600 Subject: [PATCH 2/3] distutils: blacken to satisfy flake8 --- stdlib/2and3/distutils/core.pyi | 86 ++++++++++++++++----------------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/stdlib/2and3/distutils/core.pyi b/stdlib/2and3/distutils/core.pyi index 52d5c0da3350..354eedde68e2 100644 --- a/stdlib/2and3/distutils/core.pyi +++ b/stdlib/2and3/distutils/core.pyi @@ -6,47 +6,45 @@ from distutils.dist import Distribution as Distribution from distutils.extension import Extension as Extension def setup( - *, - name: str = ..., - version: str = ..., - description: str = ..., - long_description: str = ..., - author: str = ..., - author_email: str = ..., - maintainer: str = ..., - maintainer_email: str = ..., - url: str = ..., - download_url: str = ..., - packages: List[str] = ..., - py_modules: List[str] = ..., - scripts: List[str] = ..., - ext_modules: List[Extension] = ..., - classifiers: List[str] = ..., - distclass: Type[Distribution] = ..., - script_name: str = ..., - script_args: List[str] = ..., - options: Mapping[str, Any] = ..., - license: str = ..., - keywords: Union[List[str], str] = ..., - platforms: Union[List[str], str] = ..., - cmdclass: Mapping[str, Type[Command]] = ..., - data_files: List[Tuple[str, List[str]]] = ..., - package_dir: Mapping[str, str] = ..., - obsoletes: List[str] = ..., - provides: List[str] = ..., - requires: List[str] = ..., - command_packages: List[str] = ..., - command_options: Mapping[str, Mapping[str, Tuple[Any, Any]]] = ..., - package_data: Mapping[str, List[str]] = ..., - include_package_data: bool = ..., - libraries: List[str] = ..., - headers: List[str] = ..., - ext_package: str = ..., - include_dirs: List[str] = ..., - password: str = ..., - fullname: str = ..., - **attrs: Any) -> None: ... - -def run_setup(script_name: str, - script_args: Optional[List[str]] = ..., - stop_after: str = ...) -> Distribution: ... + *, + name: str = ..., + version: str = ..., + description: str = ..., + long_description: str = ..., + author: str = ..., + author_email: str = ..., + maintainer: str = ..., + maintainer_email: str = ..., + url: str = ..., + download_url: str = ..., + packages: List[str] = ..., + py_modules: List[str] = ..., + scripts: List[str] = ..., + ext_modules: List[Extension] = ..., + classifiers: List[str] = ..., + distclass: Type[Distribution] = ..., + script_name: str = ..., + script_args: List[str] = ..., + options: Mapping[str, Any] = ..., + license: str = ..., + keywords: Union[List[str], str] = ..., + platforms: Union[List[str], str] = ..., + cmdclass: Mapping[str, Type[Command]] = ..., + data_files: List[Tuple[str, List[str]]] = ..., + package_dir: Mapping[str, str] = ..., + obsoletes: List[str] = ..., + provides: List[str] = ..., + requires: List[str] = ..., + command_packages: List[str] = ..., + command_options: Mapping[str, Mapping[str, Tuple[Any, Any]]] = ..., + package_data: Mapping[str, List[str]] = ..., + include_package_data: bool = ..., + libraries: List[str] = ..., + headers: List[str] = ..., + ext_package: str = ..., + include_dirs: List[str] = ..., + password: str = ..., + fullname: str = ..., + **attrs: Any, +) -> None: ... +def run_setup(script_name: str, script_args: Optional[List[str]] = ..., stop_after: str = ...) -> Distribution: ... From 43cb30a4f71a9308f69aaaeb8d50c240d8f7e934 Mon Sep 17 00:00:00 2001 From: hauntsaninja <> Date: Mon, 20 Jan 2020 21:24:05 -0600 Subject: [PATCH 3/3] retrigger CI build CI had some issues https://travis-ci.org/python/typeshed/jobs/639617045 This also affected #3636