generate pipx.y besides pip-x.y (#1729)

Signed-off-by: Bernat Gabor <[email protected]>

docs/changelog/1723.bugfix.rst

@@ -0,0 +1,2 @@
+Also generate ``pipx.y`` console script beside ``pip-x.y`` to be compatible with how pip installs itself -
+by :user:`gaborbernat`.

src/virtualenv/seed/via_app_data/pip_install/base.py

@@ -157,6 +157,8 @@ def _write_script(scriptnames, shebang, script, filenames, ext):
                 "{}{}".format(name, version_info.major),
                 "{}-{}.{}".format(name, version_info.major, version_info.minor),
             }
+            if name == "pip":
+                scriptnames.add("{}{}.{}".format(name, version_info.major, version_info.minor))
             return previous(scriptnames, shebang, script, filenames, ext)
 
         previous = maker._write_script

src/virtualenv/seed/via_app_data/via_app_data.py

@@ -18,7 +18,7 @@ class FromAppData(BaseEmbed):
     def __init__(self, options):
         super(FromAppData, self).__init__(options)
         self.symlinks = options.symlink_app_data
-        self.base_cache = self.app_data / "seed-app-data" / "v1"
+        self.base_cache = self.app_data / "seed-app-data" / "v1.0.1"
 
     @classmethod
     def add_parser_arguments(cls, parser, interpreter, app_data):

tests/unit/create/test_creator.py

@@ -320,7 +320,12 @@ def test_cross_major(cross_python, coverage_env, tmp_path, session_app_data, cur
     result = cli_run(cmd)
     pip_scripts = {i.name.replace(".exe", "") for i in result.creator.script_dir.iterdir() if i.name.startswith("pip")}
     major, minor = cross_python.version_info[0:2]
-    assert pip_scripts == {"pip", "pip-{}.{}".format(major, minor), "pip{}".format(major)}
+    assert pip_scripts == {
+        "pip",
+        "pip{}".format(major),
+        "pip-{}.{}".format(major, minor),
+        "pip{}.{}".format(major, minor),
+    }
     coverage_env()
     env = PythonInfo.from_exe(str(result.creator.exe), session_app_data)
     assert env.version_info.major != CURRENT.version_info.major

tests/unit/seed/test_boostrap_link_via_app_data.py

@@ -18,7 +18,7 @@
 @pytest.mark.slow
 @pytest.mark.timeout(timeout=60)
 @pytest.mark.parametrize("copies", [False, True] if fs_supports_symlink() else [True])
-def test_base_bootstrap_link_via_app_data(tmp_path, coverage_env, current_fastest, copies):
+def test_seed_link_via_app_data(tmp_path, coverage_env, current_fastest, copies):
     current = PythonInfo.current_system()
     bundle_ver = BUNDLE_SUPPORT[current.version_release_str]
     create_cmd = [
@@ -56,6 +56,7 @@ def test_base_bootstrap_link_via_app_data(tmp_path, coverage_env, current_fastes
         for suffix in (
             "",
             "{}".format(current.version_info.major),
+            "{}.{}".format(current.version_info.major, current.version_info.minor),
             "-{}.{}".format(current.version_info.major, current.version_info.minor),
         )
     ]: