Commitdd8ee4f

committed

Start fixing venv test fixture pip toml bug

This is not yet a usable fix, because venv.create only supportsupgrade_deps on Python 3.9 and higher.

1 parentd40e7d0 commitdd8ee4fCopy full SHA for dd8ee4f

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -403,13 +403,13 @@ class VirtualEnvironment:`
`403`	`403`
`404`	`404`	`__slots__= ("_env_dir",)`
`405`	`405`
`406`		`-def__init__(self,env_dir,*,with_pip):`
	`406`	`+def__init__(self,env_dir,*,need_pip):`
`407`	`407`	`ifos.name=="nt":`
`408`	`408`	`self._env_dir=osp.realpath(env_dir)`
`409`		`-venv.create(self.env_dir,symlinks=False,with_pip=with_pip)`
	`409`	`+venv.create(self.env_dir,symlinks=False,with_pip=need_pip,upgrade_deps=need_pip)`
`410`	`410`	`else:`
`411`	`411`	`self._env_dir=env_dir`
`412`		`-venv.create(self.env_dir,symlinks=True,with_pip=with_pip)`
	`412`	`+venv.create(self.env_dir,symlinks=True,with_pip=need_pip,upgrade_deps=need_pip)`
`413`	`413`
`414`	`414`	`@property`
`415`	`415`	`defenv_dir(self):`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1060,7 +1060,7 @@ def test_hook_uses_shell_not_from_cwd(self, rw_dir, case):`
`1060`	`1060`	`# from a venv may not run when copied outside of it, and a global interpreter`
`1061`	`1061`	`# won't run when copied to a different location if it was installed from the`
`1062`	`1062`	`# Microsoft Store. So we make a new venv in rw_dir and use its interpreter.`
`1063`		`-venv=VirtualEnvironment(rw_dir,with_pip=False)`
	`1063`	`+venv=VirtualEnvironment(rw_dir,need_pip=False)`
`1064`	`1064`	`shutil.copy(venv.python,Path(rw_dir,shell_name))`
`1065`	`1065`	`shutil.copy(fixture_path("polyglot"),hook_path("polyglot",repo.git_dir))`
`1066`	`1066`	`payload=Path(rw_dir,"payload.txt")`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ def test_installation(self, rw_dir):`
`64`	`64`
`65`	`65`	`@staticmethod`
`66`	`66`	`def_set_up_venv(rw_dir):`
`67`		`-venv=VirtualEnvironment(rw_dir,with_pip=True)`
	`67`	`+venv=VirtualEnvironment(rw_dir,need_pip=True)`
`68`	`68`	`os.symlink(`
`69`	`69`	`os.path.dirname(os.path.dirname(__file__)),`
`70`	`70`	`venv.sources,`

Comments

(0)