From 47d63e902c1e3e905cb4aa2de421a5cd426d2e9c Mon Sep 17 00:00:00 2001 From: Dominic Davis-Foster Date: Thu, 3 Feb 2022 09:06:50 +0000 Subject: [PATCH] Fix double parentheses caused by pypa/virtualenv#2224 --- pyproject_devenv/__init__.py | 2 +- requirements.txt | 2 +- tests/test_cli.py | 4 ++-- tests/test_devenv.py | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pyproject_devenv/__init__.py b/pyproject_devenv/__init__.py index 429c2ff..100fee0 100644 --- a/pyproject_devenv/__init__.py +++ b/pyproject_devenv/__init__.py @@ -161,7 +161,7 @@ def create(self) -> int: args = [ str(self.venv_dir), "--prompt", - f"({self.config['name']}) ", + f"{self.config['name']}", "--seeder", "pip", "--download", diff --git a/requirements.txt b/requirements.txt index db5dd49..23249f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ packaging>=20.9 pyproject-parser>=0.2.0 shippinglabel>=0.14.1 typing-extensions>=3.7.4.3 -virtualenv>=20.4.3 +virtualenv>=20.10.0 diff --git a/tests/test_cli.py b/tests/test_cli.py index 796584d..ae56731 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -74,7 +74,7 @@ def test_mkdevenv(tmp_pathplus: PathPlus): pyvenv_config: Dict[str, str] = read_pyvenv(venv_dir) assert "prompt" in pyvenv_config - assert pyvenv_config["prompt"] == "(pyproject-devenv-demo) " + assert pyvenv_config["prompt"] == "pyproject-devenv-demo" assert "pyproject-devenv" in pyvenv_config assert pyvenv_config["pyproject-devenv"] == __version__ @@ -158,7 +158,7 @@ def test_mkdevenv_verbose(tmp_pathplus: PathPlus, extra_args): pyvenv_config: Dict[str, str] = read_pyvenv(venv_dir) assert "prompt" in pyvenv_config - assert pyvenv_config["prompt"] == "(pyproject-devenv-demo) " + assert pyvenv_config["prompt"] == "pyproject-devenv-demo" assert "pyproject-devenv" in pyvenv_config assert pyvenv_config["pyproject-devenv"] == __version__ diff --git a/tests/test_devenv.py b/tests/test_devenv.py index ae194fe..e7f4e79 100644 --- a/tests/test_devenv.py +++ b/tests/test_devenv.py @@ -70,7 +70,7 @@ def test_mkdevenv(tmp_pathplus: PathPlus, capsys, verbosity: int): pyvenv_config: Dict[str, str] = read_pyvenv(venv_dir) assert "prompt" in pyvenv_config - assert pyvenv_config["prompt"] == "(pyproject-devenv-demo) " + assert pyvenv_config["prompt"] == "pyproject-devenv-demo" assert "pyproject-devenv" in pyvenv_config assert pyvenv_config["pyproject-devenv"] == __version__ @@ -144,7 +144,7 @@ def test_mkdevenv_extras(tmp_pathplus: PathPlus, capsys): pyvenv_config: Dict[str, str] = read_pyvenv(venv_dir) assert "prompt" in pyvenv_config - assert pyvenv_config["prompt"] == "(pyproject-devenv-demo) " + assert pyvenv_config["prompt"] == "pyproject-devenv-demo" assert "pyproject-devenv" in pyvenv_config assert pyvenv_config["pyproject-devenv"] == __version__ @@ -213,7 +213,7 @@ def test_mkdevenv_no_build_deps(tmp_pathplus: PathPlus, capsys): pyvenv_config: Dict[str, str] = read_pyvenv(venv_dir) assert "prompt" in pyvenv_config - assert pyvenv_config["prompt"] == "(pyproject-devenv-demo) " + assert pyvenv_config["prompt"] == "pyproject-devenv-demo" assert "pyproject-devenv" in pyvenv_config assert pyvenv_config["pyproject-devenv"] == __version__ @@ -268,7 +268,7 @@ def test_mkdevenv_no_lib_deps(tmp_pathplus: PathPlus, capsys): pyvenv_config: Dict[str, str] = read_pyvenv(venv_dir) assert "prompt" in pyvenv_config - assert pyvenv_config["prompt"] == "(pyproject-devenv-demo) " + assert pyvenv_config["prompt"] == "pyproject-devenv-demo" assert "pyproject-devenv" in pyvenv_config assert pyvenv_config["pyproject-devenv"] == __version__ @@ -323,7 +323,7 @@ def test_mkdevenv_no_lib_deps_dynamic(tmp_pathplus: PathPlus, capsys): pyvenv_config: Dict[str, str] = read_pyvenv(venv_dir) assert "prompt" in pyvenv_config - assert pyvenv_config["prompt"] == "(pyproject-devenv-demo) " + assert pyvenv_config["prompt"] == "pyproject-devenv-demo" assert "pyproject-devenv" in pyvenv_config assert pyvenv_config["pyproject-devenv"] == __version__ @@ -390,7 +390,7 @@ def test_mkdevenv_no_dynamic(tmp_pathplus: PathPlus, capsys): pyvenv_config: Dict[str, str] = read_pyvenv(venv_dir) assert "prompt" in pyvenv_config - assert pyvenv_config["prompt"] == "(pyproject-devenv-demo) " + assert pyvenv_config["prompt"] == "pyproject-devenv-demo" assert "pyproject-devenv" in pyvenv_config assert pyvenv_config["pyproject-devenv"] == __version__