Upgrade setuptools and pip (#1939)

Author: gaborbernat

.pre-commit-config.yaml

@@ -11,25 +11,16 @@ repos:
   - id: debug-statements
   - id: end-of-file-fixer
   - id: trailing-whitespace
-- repo: https://github.com/asottile/add-trailing-comma
-  rev: v2.0.1
-  hooks:
-  - id: add-trailing-comma
 - repo: https://github.com/asottile/pyupgrade
   rev: v2.7.2
   hooks:
   - id: pyupgrade
-- repo: https://github.com/asottile/seed-isort-config
-  rev: v2.2.0
-  hooks:
-  - id: seed-isort-config
-    args: [--application-directories, '.:src']
-- repo: https://github.com/pre-commit/mirrors-isort
-  rev: v5.4.2
+- repo: https://github.com/PyCQA/isort
+  rev: 5.5.2
   hooks:
   - id: isort
 - repo: https://github.com/ambv/black
-  rev: 19.10b0
+  rev: 20.8b1
   hooks:
   - id: black
     args: [--safe]
@@ -38,7 +29,7 @@ repos:
   rev: v1.8.0
   hooks:
   - id: blacken-docs
-    additional_dependencies: [black==19.10b0]
+    additional_dependencies: [black==20.8b1]
     language_version: python3.8
 - repo: https://github.com/pre-commit/pygrep-hooks
   rev: v1.6.0
@@ -49,7 +40,7 @@ repos:
   hooks:
   - id: setup-cfg-fmt
     args: [--min-py3-version, "3.4"]
-- repo: https://gitlab.com/pycqa/flake8
+- repo: https://github.com/PyCQA/flake8
   rev: "3.8.3"
   hooks:
   - id: flake8

docs/changelog/1939.bugfix.rst

@@ -0,0 +1 @@
+Upgrade embedded setuptools to ``50.2.0`` and pip to ``20.2.3`` - by :user:`gaborbernat`.

docs/conf.py

@@ -60,7 +60,9 @@
 def generate_draft_news():
     root = Path(__file__).parents[1]
     new = subprocess.check_output(
-        [sys.executable, "-m", "towncrier", "--draft", "--version", "NEXT"], cwd=root, universal_newlines=True,
+        [sys.executable, "-m", "towncrier", "--draft", "--version", "NEXT"],
+        cwd=root,
+        universal_newlines=True,
     )
     (root / "docs" / "_draft.rst").write_text("" if "No significant changes" in new else new)
 

setup.cfg

@@ -123,7 +123,7 @@ universal = true
 markers =
     slow
 junit_family = xunit2
-addopts = --tb=auto -ra --showlocals
+addopts = --tb=auto -ra --showlocals --no-success-flaky-report
 env =
     PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command
     PYTHONIOENCODING=utf-8

src/virtualenv/app_data/via_disk_folder.py

@@ -168,5 +168,8 @@ def __init__(self, in_folder, path):
 class EmbedDistributionUpdateStoreDisk(JSONStoreDisk):
     def __init__(self, in_folder, distribution):
         super(EmbedDistributionUpdateStoreDisk, self).__init__(
-            in_folder, distribution, "embed update of distribution %s", (distribution,),
+            in_folder,
+            distribution,
+            "embed update of distribution %s",
+            (distribution,),
         )

src/virtualenv/create/creator.py

@@ -79,7 +79,9 @@ def add_parser_arguments(cls, parser, interpreter, meta, app_data):
         :param meta: value as returned by :meth:`can_create`
         """
         parser.add_argument(
-            "dest", help="directory to create virtualenv at", type=cls.validate_dest,
+            "dest",
+            help="directory to create virtualenv at",
+            type=cls.validate_dest,
         )
         parser.add_argument(
             "--clear",
@@ -120,7 +122,9 @@ def non_write_able(dest, value):
         if refused:
             raise ArgumentTypeError(
                 "the file system codec ({}) cannot handle characters {!r} within {!r}".format(
-                    encoding, "".join(refused.keys()), raw_value,
+                    encoding,
+                    "".join(refused.keys()),
+                    raw_value,
                 ),
             )
         if os.pathsep in raw_value:

src/virtualenv/create/via_global_ref/builtin/cpython/mac_os.py

@@ -241,7 +241,7 @@ def read_data(file, endian, num=1):
 
     def mach_o_change(at_path, what, value):
         """Replace a given name (what) in any LC_LOAD_DYLIB command found in the given binary with a new name (value),
-         provided it's shorter."""
+        provided it's shorter."""
 
         def do_macho(file, bits, endian):
             # Read Mach-O header (the magic number is assumed read by the caller)

src/virtualenv/create/via_global_ref/builtin/via_global_self_do.py

@@ -38,7 +38,8 @@ def can_create(cls, interpreter):
                             meta.symlink_error = "cannot symlink {}".format(src)
                         if not meta.can_copy and not meta.can_symlink:
                             meta.error = "neither copy or symlink supported, copy: {} symlink: {}".format(
-                                meta.copy_error, meta.symlink_error,
+                                meta.copy_error,
+                                meta.symlink_error,
                             )
                     else:
                         meta.error = "missing required file {}".format(src)
@@ -92,7 +93,7 @@ def set_pyenv_cfg(self):
         """
         We directly inject the base prefix and base exec prefix to avoid site.py needing to discover these
         from home (which usually is done within the interpreter itself)
-         """
+        """
         super(ViaGlobalRefVirtualenvBuiltin, self).set_pyenv_cfg()
         self.pyenv_cfg["base-prefix"] = self.interpreter.system_prefix
         self.pyenv_cfg["base-exec-prefix"] = self.interpreter.system_exec_prefix

src/virtualenv/create/via_global_ref/venv.py

@@ -46,7 +46,10 @@ def create_inline(self):
         from venv import EnvBuilder
 
         builder = EnvBuilder(
-            system_site_packages=self.enable_system_site_package, clear=False, symlinks=self.symlinks, with_pip=False,
+            system_site_packages=self.enable_system_site_package,
+            clear=False,
+            symlinks=self.symlinks,
+            with_pip=False,
         )
         builder.create(str(self.dest))
 

src/virtualenv/discovery/cached_py_info.py

@@ -104,7 +104,10 @@ def _run_subprocess(cls, exe, app_data):
         result.executable = exe  # keep original executable as this may contain initialization code
     else:
         msg = "failed to query {} with code {}{}{}".format(
-            exe, code, " out: {!r}".format(out) if out else "", " err: {!r}".format(err) if err else "",
+            exe,
+            code,
+            " out: {!r}".format(out) if out else "",
+            " err: {!r}".format(err) if err else "",
         )
         failure = RuntimeError(msg)
     return failure, result