Fix bin_dir to bin_path + fix unittest pathing

python · ambv · Jun 17, 2019 · Jun 17, 2019 · May 5, 2019 · May 5, 2019
commit 9bd89f414d5be42e45cb827a92c05f596084b002
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
@@ -138,14 +138,15 @@ def test_prompt(self):
 
     def test_upgrade_dependencies(self):
         builder = venv.EnvBuilder()
+        bin_path = 'Scripts' if sys.platform == 'win32' else 'bin'
         pip_exe = 'pip.exe' if sys.platform == 'win32' else 'pip'
         with tempfile.TemporaryDirectory() as fake_env_dir:
 
             def pip_cmd_checker(cmd):
                 self.assertEqual(
                     cmd,
                     [
-                        os.path.join(fake_env_dir, pip_exe),
+                        os.path.join(fake_env_dir, bin_path, pip_exe),
                         'install',
                         '-U',
                         'pip',
@@ -155,7 +156,7 @@ def pip_cmd_checker(cmd):
 
             fake_context = builder.ensure_directories(fake_env_dir)
             with patch("venv.subprocess.check_call", pip_cmd_checker):
-                builder.upgrade_dependencies(fake_context, fake_env_dir)
+                builder.upgrade_dependencies(fake_context)
 
     @requireVenvCreate
     def test_prefixes(self):

diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
@@ -80,7 +80,7 @@ def create(self, env_dir):
             self.system_site_packages = True
             self.create_configuration(context)
         if self.upgrade_deps:
-            self.upgrade_dependencies(context, env_dir)
+            self.upgrade_dependencies(context)
 
     def clear_directory(self, path):
         for fn in os.listdir(path):
@@ -369,14 +369,14 @@ def install_scripts(self, context, path):
                         f.write(data)
                     shutil.copymode(srcfile, dstfile)
 
-    def upgrade_dependencies(self, context, env_dir):
+    def upgrade_dependencies(self, context):
         logging.debug(
-            'Upgrading {} packages in {}'.format(CORE_VENV_DEPS, env_dir)
+            'Upgrading {} packages in {}'.format(CORE_VENV_DEPS, context.bin_path)
         )
         if sys.platform == 'win32':
-            pip_exe = os.path.join(context.bin_dir, 'pip.exe')
+            pip_exe = os.path.join(context.bin_path, 'pip.exe')
         else:
-            pip_exe = os.path.join(context.bin_dir, 'pip')
+            pip_exe = os.path.join(context.bin_path, 'pip')
         cmd = [pip_exe, 'install', '-U']
         cmd.extend(CORE_VENV_DEPS)
         subprocess.check_call(cmd)

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-05-05-18-09-40.bpo-34556.o9kfpu.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-05-18-09-40.bpo-34556.o9kfpu.rst
@@ -0,0 +1 @@
+Add --upgrade-de
9001
ps to venv module
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add --upgrade-de 9001 ps to venv module
Copy link Member matrixise May 7, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Use the ReST markup like `--upgrade-deps`. Add "Patch by ..." Copy link Contributor Author cooperlees May 7, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Sure thing.