Remove custom implementation of _venv_get_version_or_none

tests/conftest.py

@@ -19,7 +19,6 @@
 
 import pytest
 import os
-import subprocess
 from tempfile import TemporaryDirectory
 
 try:
@@ -53,18 +52,6 @@ def _venv_install_pip(venv):
         venv.install(f"setuptools{MICROPIPENV_TEST_SETUPTOOLS_VERSION}")
 
 
-def _venv_get_version_or_none(self, package):
-    """Extend the original method from pytest-venv fixture.
-
-    See https://github.com/mmerickel/pytest-venv/issues/3
-    """
-    try:
-        version = self.get_version(package)
-        return version
-    except subprocess.CalledProcessError:
-        return None
-
-
 def pytest_configure(config):
     """Configure tests before pytest collects tests."""
     global PIP_VERSION
@@ -94,7 +81,6 @@ def venv_with_pip():
 
     with TemporaryDirectory() as tmp_dir:
         # Extend the VirtulEnvironment class first
-        VirtualEnvironment.get_version_or_none = _venv_get_version_or_none
         venv = VirtualEnvironment(str(tmp_dir))
         venv.create()
         _venv_install_pip(venv)

tests/test_micropipenv.py

@@ -308,11 +308,11 @@ def test_install_poetry_complex_example(venv):
         subprocess.run(cmd, check=True, env=get_updated_env(venv))
         assert str(venv.get_version("requests")) == "2.27.1"
         # Dependency defined as requests[use_chardet_on_py3] extra
-        assert venv.get_version_or_none("chardet") is not None
+        assert venv.get_version("chardet", raises=False) is not None
         # unicodedata2 is provided as charset-normalizer[unicode_backport] but is not specified for installation
-        assert venv.get_version_or_none("unicodedata2") is None
+        assert venv.get_version("unicodedata2", raises=False) is None
         # also, requests[socks] or urllib3[socks] should not be installed
-        assert venv.get_version_or_none("PySocks") is None
+        assert venv.get_version("PySocks", raises=False) is None
 
 
 @pytest.mark.online