Imported Upstream version 46.1.1

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 28a327b2f8aecc29e73dde8fdbf77c126ae8f24d..03fe7b43fdade4e3fde03701082fce9ed9099e85 100644 (file)
--- 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 12680a4d20f67e3561615e3ff4f8ccd28f754a41..1edbd12acbb14549f918c5acc4a31e97978b9574 100644 (file)
--- 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 (file)
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 0e9a05ed53bf6ddbed9703353a26b8b1a501e928..14426181822e1e8c589b91777e8390d91f42b370 100644 (file)
--- 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 6fc0a4e46d7e3a866da8ce00d2d5fb68fe9e1e4c..bac4fb1c93c826ad9169c838163930c741f138a0 100644 (file)
--- 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):