pydepinject 0.0.1.dev0__tar.gz → 0.0.1.dev2__tar.gz

{pydepinject-0.0.1.dev0 → pydepinject-0.0.1.dev2}/MANIFEST.in

@@ -1,3 +1,3 @@
 graft src
 exclude Dockerfile noxfile.py tasks.py scripts/*
-global-exclude *~ *.py[cod] *.so .devcontainer/*
+global-exclude *~ *.py[cod] *.so .devcontainer/* .vscode/*

{pydepinject-0.0.1.dev0/src/pydepinject.egg-info → pydepinject-0.0.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydepinject
-Version: 0.0.1.dev0
+Version: 0.0.1.dev2
 Summary: A package to dynamically inject requirements into a virtual environment.
 Author: pydepinject
 License: MIT
@@ -21,6 +21,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: packaging~=22.0
 Provides-Extra: lint
 Requires-Dist: ruff==0.4.7; extra == "lint"
 Requires-Dist: pyright==1.1.365; extra == "lint"
@@ -28,6 +29,7 @@ Requires-Dist: isort==5.13.2; extra == "lint"
 Provides-Extra: test
 Requires-Dist: pytest==8.2.1; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
+Requires-Dist: pytest-xdist==3.6.1; extra == "test"
 Provides-Extra: build
 Requires-Dist: check-manifest==0.49; extra == "build"
 Requires-Dist: build==1.2.1; extra == "build"
@@ -86,6 +88,43 @@ with requires("requests", "numpy"):
     print(np.__version__)
 ```
 
+### Virtual Environment with specific name
+
+The `requires` can create a virtual environment with a specific name:
+
+```python
+@requires("requests", venv_name="myenv")
+def my_function():
+    import requests
+    print(requests.__version__)
+
+
+with requires("pylint", venv_name="myenv"):
+    import pylint
+    print(pylint.__version__)
+    import requests  # This is also available here because it was installed in the same virtual environment
+    print(requests.__version__)
+
+
+# The virtual environment name can also be set as PYDEPINJECT_VENV_NAME environment variable
+import os
+os.environ["PYDEPINJECT_VENV_NAME"] = "myenv"
+
+@requires("requests")
+def my_function():
+    import requests
+    print(requests.__version__)
+
+
+with requires("pylint"):
+    import pylint
+    print(pylint.__version__)
+    import requests  # This is also available here because it was installed in the same virtual environment
+    print(requests.__version__)
+```
+
+
+
 ### Reusable Virtual Environments
 
 The `requires` can create named virtual environments and reuse them across multiple functions or code blocks:

{pydepinject-0.0.1.dev0 → pydepinject-0.0.1.dev2}/Readme.md

@@ -50,6 +50,43 @@ with requires("requests", "numpy"):
     print(np.__version__)
 ```
 
+### Virtual Environment with specific name
+
+The `requires` can create a virtual environment with a specific name:
+
+```python
+@requires("requests", venv_name="myenv")
+def my_function():
+    import requests
+    print(requests.__version__)
+
+
+with requires("pylint", venv_name="myenv"):
+    import pylint
+    print(pylint.__version__)
+    import requests  # This is also available here because it was installed in the same virtual environment
+    print(requests.__version__)
+
+
+# The virtual environment name can also be set as PYDEPINJECT_VENV_NAME environment variable
+import os
+os.environ["PYDEPINJECT_VENV_NAME"] = "myenv"
+
+@requires("requests")
+def my_function():
+    import requests
+    print(requests.__version__)
+
+
+with requires("pylint"):
+    import pylint
+    print(pylint.__version__)
+    import requests  # This is also available here because it was installed in the same virtual environment
+    print(requests.__version__)
+```
+
+
+
 ### Reusable Virtual Environments
 
 The `requires` can create named virtual environments and reuse them across multiple functions or code blocks:

{pydepinject-0.0.1.dev0 → pydepinject-0.0.1.dev2}/pyproject.toml

@@ -15,6 +15,9 @@ authors = [
 license = { text="MIT" }
 keywords = ["virtualenv", "requirements", "dependency management"]
 requires-python = ">=3.9"
+dependencies = [
+    "packaging~=22.0",
+]
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Developers",
@@ -42,6 +45,7 @@ lint = [
 test = [
     "pytest==8.2.1",
     "pytest-cov==5.0.0",
+    "pytest-xdist==3.6.1",
 ]
 build = [
     "check-manifest==0.49",
@@ -62,7 +66,8 @@ log_level = "DEBUG"
 
 [tool.pytest.ini_options]
 pythonpath = "src"
-
+addopts = "--durations=10 -n auto"
+# Estimated test times: 74s with auto (2), 76s with 6 workers, 113se with no workers.
 
 [tool.ruff]
 preview = true
@@ -126,7 +131,8 @@ ignore = []
 uv = {version = "0.2.5"}
 invoke = {version = "2.2.0", preinstall = ["tomli"]}
 nox = {version = "2024.4.15"}
-twine = {version = "5.1.1"}
+twine = {version = "5.1.0"}
 
 [tool.custom.ci]
 python_versions = ["3.9", "3.10", "3.11", "3.12"]
+packaging_versions = ["22", "23", "24"]

{pydepinject-0.0.1.dev0 → pydepinject-0.0.1.dev2}/src/pydepinject/__init__.py

@@ -18,7 +18,7 @@ if typing.TYPE_CHECKING:
     from typing import Any
 
 
-VERSION = "0.0.1dev"
+VERSION = "0.0.1dev2"
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
@@ -31,25 +31,41 @@ logger.debug("VENV_ROOT: %s", VENV_ROOT)
 def is_requirements_satisfied(*packages: str):
     """Check if the requirements are already satisfied. Return None if it cannot be determined."""
     try:
-        if "pkg_resources" in sys.modules:
-            del sys.modules["pkg_resources"]
-        import pkg_resources
+        from importlib.metadata import PackageNotFoundError, distribution
+
+        from packaging.requirements import Requirement
     except ImportError:
-        logger.debug(
-            "pkg_resources not found. Cannot check if requirements are satisfied."
-        )
-        return None
+        try:
+            from importlib.metadata import PackageNotFoundError, distribution
+
+            from packaging.requirements import Requirement
+        except ImportError:
+            logger.warning(
+                "importlib.metadata and packaging not found. Cannot check if requirements are satisfied."
+            )
+            return None
 
     try:
         for package in packages:
             logger.debug("Checking package: %s", package)
-            req = pkg_resources.Requirement.parse(package)
-            pkg_resources.require(str(req))
-            logger.debug("Requirement %s is satisfied", package)
+            req = Requirement(package)
+            try:
+                dist = distribution(req.name)
+                if dist.version not in req.specifier:
+                    logger.debug(
+                        "Requirement %s is not satisfied. Version conflict.", package
+                    )
+                    return False
+                logger.debug("Requirement %s is satisfied", package)
+            except PackageNotFoundError:
+                logger.debug(
+                    "Requirement %s is not satisfied. Distribution not found.", package
+                )
+                return False
         return True
-    except (pkg_resources.DistributionNotFound, pkg_resources.VersionConflict):
-        logger.debug("Requirements %s are not satisfied. Return False", packages)
-        return False
+    except Exception as e:
+        logger.warning("An error occurred while checking requirements: %s", str(e))
+        return None
 
 
 class RequirementManager:
@@ -74,7 +90,7 @@ class RequirementManager:
             ephemeral: If True, the virtual environment will be deleted after use.
         """
         self.packages = packages
-        self.venv_name = venv_name
+        self.venv_name = venv_name or os.environ.get("PYDEPINJECT_VENV_NAME", "")
         self.original_pythonpath = os.environ.get("PYTHONPATH", "")
         self.original_path = os.environ.get("PATH", "")
         self.original_syspath = sys.path.copy()

{pydepinject-0.0.1.dev0 → pydepinject-0.0.1.dev2/src/pydepinject.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydepinject
-Version: 0.0.1.dev0
+Version: 0.0.1.dev2
 Summary: A package to dynamically inject requirements into a virtual environment.
 Author: pydepinject
 License: MIT
@@ -21,6 +21,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: packaging~=22.0
 Provides-Extra: lint
 Requires-Dist: ruff==0.4.7; extra == "lint"
 Requires-Dist: pyright==1.1.365; extra == "lint"
@@ -28,6 +29,7 @@ Requires-Dist: isort==5.13.2; extra == "lint"
 Provides-Extra: test
 Requires-Dist: pytest==8.2.1; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
+Requires-Dist: pytest-xdist==3.6.1; extra == "test"
 Provides-Extra: build
 Requires-Dist: check-manifest==0.49; extra == "build"
 Requires-Dist: build==1.2.1; extra == "build"
@@ -86,6 +88,43 @@ with requires("requests", "numpy"):
     print(np.__version__)
 ```
 
+### Virtual Environment with specific name
+
+The `requires` can create a virtual environment with a specific name:
+
+```python
+@requires("requests", venv_name="myenv")
+def my_function():
+    import requests
+    print(requests.__version__)
+
+
+with requires("pylint", venv_name="myenv"):
+    import pylint
+    print(pylint.__version__)
+    import requests  # This is also available here because it was installed in the same virtual environment
+    print(requests.__version__)
+
+
+# The virtual environment name can also be set as PYDEPINJECT_VENV_NAME environment variable
+import os
+os.environ["PYDEPINJECT_VENV_NAME"] = "myenv"
+
+@requires("requests")
+def my_function():
+    import requests
+    print(requests.__version__)
+
+
+with requires("pylint"):
+    import pylint
+    print(pylint.__version__)
+    import requests  # This is also available here because it was installed in the same virtual environment
+    print(requests.__version__)
+```
+
+
+
 ### Reusable Virtual Environments
 
 The `requires` can create named virtual environments and reuse them across multiple functions or code blocks:

{pydepinject-0.0.1.dev0 → pydepinject-0.0.1.dev2}/src/pydepinject.egg-info/requires.txt

@@ -1,3 +1,4 @@
+packaging~=22.0
 
 [build]
 check-manifest==0.49
@@ -13,3 +14,4 @@ isort==5.13.2
 [test]
 pytest==8.2.1
 pytest-cov==5.0.0
+pytest-xdist==3.6.1

{pydepinject-0.0.1.dev0 → pydepinject-0.0.1.dev2}/tests/test_pydepinject.py

@@ -37,6 +37,80 @@ def test_decorator(venv_root, ephemeral):
         assert len(list(venv_root.iterdir())) == 1
 
 
+@pytest.mark.parametrize("ephemeral", [True, False], ids=["ephemeral", "non-ephemeral"])
+def test_venv_name_predefined(venv_root, ephemeral):
+    assert not list(venv_root.iterdir())
+
+    venv_name = "test_venv_name_predefined"
+    with pytest.raises(ImportError):
+        import six
+
+    @requires("six", venv_root=venv_root, venv_name=venv_name, ephemeral=ephemeral)
+    def examplefn():
+        print("examplefn")
+        import six
+
+        assert six.__version__
+        assert (venv_root / venv_name).exists()
+
+    examplefn()
+    with pytest.raises(ImportError):
+        import six
+
+    assert (venv_root / venv_name).exists() is (not ephemeral)
+    assert len(list(venv_root.iterdir())) == (1 if not ephemeral else 0)
+
+    with requires("six", venv_root=venv_root, venv_name=venv_name, ephemeral=ephemeral):
+        import six
+
+        assert six.__version__
+        assert (venv_root / venv_name).exists()
+
+    with pytest.raises(ImportError):
+        import six
+
+    assert (venv_root / venv_name).exists() is (not ephemeral)
+    assert len(list(venv_root.iterdir())) == (1 if not ephemeral else 0)
+
+
+@pytest.mark.parametrize("ephemeral", [True, False], ids=["ephemeral", "non-ephemeral"])
+def test_venv_name_predefined_env(venv_root, monkeypatch, ephemeral):
+    assert not list(venv_root.iterdir())
+
+    venv_name = "test_venv_name_predefined_env"
+    monkeypatch.setenv("PYDEPINJECT_VENV_NAME", venv_name)
+
+    with pytest.raises(ImportError):
+        import six
+
+    @requires("six", venv_root=venv_root, ephemeral=ephemeral)
+    def examplefn():
+        print("examplefn")
+        import six
+
+        assert six.__version__
+        assert (venv_root / venv_name).exists()
+
+    examplefn()
+    with pytest.raises(ImportError):
+        import six
+
+    assert (venv_root / venv_name).exists() is (not ephemeral)
+    assert len(list(venv_root.iterdir())) == (1 if not ephemeral else 0)
+
+    with requires("six", venv_root=venv_root, ephemeral=ephemeral):
+        import six
+
+        assert six.__version__
+        assert (venv_root / venv_name).exists()
+
+    with pytest.raises(ImportError):
+        import six
+
+    assert (venv_root / venv_name).exists() is (not ephemeral)
+    assert len(list(venv_root.iterdir())) == (1 if not ephemeral else 0)
+
+
 @pytest.mark.parametrize("ephemeral", [True, False], ids=["ephemeral", "non-ephemeral"])
 def test_context_manager(venv_root, ephemeral):
     assert not list(venv_root.iterdir())
@@ -74,6 +148,7 @@ def test_function_call(venv_root):
     requires_instance._deactivate_venv()
     with pytest.raises(ImportError):
         import six
+    assert len(list(venv_root.iterdir())) == 1
 
 
 def test_no_installs(venv_root):
@@ -127,6 +202,7 @@ def test_one_venv_multiple_packages(venv_root):
         import six
 
         assert six.__version__
+        assert (venv_root / venv_name).exists()
 
     @requires("pyparsing", venv_root=venv_root, venv_name=venv_name, ephemeral=False)
     def examplefn2():
@@ -137,10 +213,14 @@ def test_one_venv_multiple_packages(venv_root):
         import six
 
         assert six.__version__
+        assert (venv_root / venv_name).exists()
 
     examplefn()
     examplefn2()
 
+    # Still exists as ephemeral is False.
+    assert (venv_root / venv_name).exists()
+
     with pytest.raises(ImportError):
         import six
     with pytest.raises(ImportError):