From 95afffafdc8043485e1ecad4a0e93c5a708198d3 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 30 Dec 2020 07:05:15 +0900 Subject: [PATCH] Imported Upstream version 46.1.1 --- .bumpversion.cfg | 2 +- CHANGES.rst | 6 ++++++ changelog.d/1424.bugfix.rst | 1 + setup.cfg | 2 +- setuptools/command/build_py.py | 3 ++- 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 changelog.d/1424.bugfix.rst diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 28a327b..03fe7b4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 46.1.0 +current_version = 46.1.1 commit = True tag = True diff --git a/CHANGES.rst b/CHANGES.rst index 12680a4..1edbd12 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +v46.1.1 +------- + +No significant changes. + + v46.1.0 ------- diff --git a/changelog.d/1424.bugfix.rst b/changelog.d/1424.bugfix.rst new file mode 100644 index 0000000..2c7209f --- /dev/null +++ b/changelog.d/1424.bugfix.rst @@ -0,0 +1 @@ +Fixed lint error (long line) in #1424. diff --git a/setup.cfg b/setup.cfg index 0e9a05e..1442618 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,7 @@ formats = zip [metadata] name = setuptools -version = 46.1.0 +version = 46.1.1 description = Easily download, build, install, upgrade, and uninstall Python packages author = Python Packaging Authority author_email = distutils-sig@python.org diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py index 6fc0a4e..bac4fb1 100644 --- a/setuptools/command/build_py.py +++ b/setuptools/command/build_py.py @@ -120,7 +120,8 @@ class build_py(orig.build_py, Mixin2to3): target = os.path.join(build_dir, filename) self.mkpath(os.path.dirname(target)) srcfile = os.path.join(src_dir, filename) - outf, copied = self.copy_file(srcfile, target, preserve_mode=False) + outf, copied = self.copy_file( + srcfile, target, preserve_mode=False) srcfile = os.path.abspath(srcfile) if (copied and srcfile in self.distribution.convert_2to3_doctests): -- 2.34.1