Merge pull request #1664 from EliahKagan/venv

Byron · web-flow · commit 7744984b13e6 · 2023-09-18T08:18:04.000+02:00
Use venv instead of virtualenv in test_installation
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -6,4 +6,3 @@ pre-commit
 pytest
 pytest-cov
 pytest-sugar
-virtualenv
diff --git a/test/test_installation.py b/test/test_installation.py
@@ -4,6 +4,8 @@
 import ast
 import os
 import subprocess
+import sys
+
 from git.compat import is_win
 from test.lib import TestBase
 from test.lib.helper import with_rw_directory
@@ -12,7 +14,7 @@
 class TestInstallation(TestBase):
 def setUp_venv(self, rw_dir):
 self.venv = rw_dir
- subprocess.run(["virtualenv", self.venv], stdout=subprocess.PIPE)
+ subprocess.run([sys.executable, "-m", "venv", self.venv], stdout=subprocess.PIPE)
 bin_name = "Scripts" if is_win else "bin"
 self.python = os.path.join(self.venv, bin_name, "python")
 self.pip = os.path.join(self.venv, bin_name, "pip")

-Original file line number
+Diff line change
 importast
 importos
 importsubprocess
 +importsys
++
 fromgit.compatimportis_win
 fromtest.libimportTestBase
 fromtest.lib.helperimportwith_rw_directory
 classTestInstallation(TestBase):
 defsetUp_venv(self, rw_dir):
 self.venv=rw_dir
 -subprocess.run(["virtualenv", self.venv], stdout=subprocess.PIPE)
 +subprocess.run([sys.executable, "-m", "venv", self.venv], stdout=subprocess.PIPE)
 bin_name="Scripts"ifis_winelse"bin"
 self.python=os.path.join(self.venv, bin_name, "python")
 self.pip=os.path.join(self.venv, bin_name, "pip")