jvcli 2.0.21__tar.gz → 2.0.22__tar.gz

{jvcli-2.0.21/jvcli.egg-info → jvcli-2.0.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvcli
-Version: 2.0.21
+Version: 2.0.22
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.
@@ -18,6 +18,8 @@ Requires-Dist: streamlit-elements>=0.1.0
 Requires-Dist: streamlit-router>=0.1.8
 Requires-Dist: streamlit-javascript>=0.1.5
 Requires-Dist: python-dotenv>=1.0.0
+Requires-Dist: semver>=3.0.4
+Requires-Dist: node-semver>=0.9.0
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{jvcli-2.0.21 → jvcli-2.0.22}/jvcli/__init__.py

@@ -4,5 +4,5 @@ jvcli package initialization.
 This package provides the CLI tool for Jivas Package Repository.
 """
 
-__version__ = "2.0.21"
+__version__ = "2.0.22"
 __supported__jivas__versions__ = ["2.0.0"]

{jvcli-2.0.21 → jvcli-2.0.22}/jvcli/utils.py

@@ -5,10 +5,10 @@ import re
 import tarfile
 
 import click
+import nodesemver
 import requests
+import semver
 import yaml
-from packaging.specifiers import InvalidSpecifier, SpecifierSet
-from packaging.version import InvalidVersion, Version
 
 from jvcli import __supported__jivas__versions__
 from jvcli.api import RegistryAPI
@@ -91,58 +91,36 @@ def validate_package_name(name: str) -> None:
         )
 
 
-def is_version_compatible(version: str, specifiers: str) -> bool:
+def is_version_compatible(
+    version: str, specifiers: str, allow_prerelease: bool = True
+) -> bool:
     """
-    Determines if the provided version satisfies the given specifiers or exact version match.
+    Determines if the provided version satisfies the given specifiers or exact version match,
+    with an option to consider prerelease versions.
 
-    Args:
-    - version (str): The version to be checked. E.g., "2.1.0".
-    - specifiers (str): The version specifier set or exact version. E.g., "2.1.0", ">=0.2,<0.3", or "^2.0.0".
-
-    Returns:
-    - bool: True if the version satisfies the specifier set or exact match, False otherwise.
+    - Converts comma-separated specifiers to space-separated (Node-style).
     """
-    try:
-        # Handle edge cases for empty strings or None inputs
-        if not version or not specifiers:
-            return False
-
-        # Handle exact version equality when no special characters present
-        if all(c not in specifiers for c in "<>!=~^*,"):
-            return Version(version) == Version(specifiers)
-
-        # Handle tilde (~) syntax, as in npm semver, if used
-        if specifiers.startswith("~"):
-            base_version = Version(specifiers[1:])
-            if base_version.release is None or len(base_version.release) < 2:
-                raise InvalidSpecifier(f"Invalid tilde specifier: '{specifiers}'")
-            next_minor = base_version.minor + 1
-            specifiers = f">={base_version},<{base_version.major}.{next_minor}.0"
-
-        # Explicitly handle caret (^) syntax (npm semver style)
-        elif specifiers.startswith("^"):
-            base_version = Version(specifiers[1:])
-            major, minor, patch = (
-                base_version.major,
-                base_version.minor,
-                base_version.micro,
-            )
-
-            if major > 0:
-                specifiers = f">={base_version},<{major + 1}.0.0"
-            elif major == 0 and minor > 0:
-                specifiers = f">={base_version},<0.{minor + 1}.0"
-            else:  # major == 0 and minor == 0
-                specifiers = f">={base_version},<0.0.{patch + 1}"
-
-        # Finally check using the SpecifierSet
-        specifier_set = SpecifierSet(specifiers)
-        parsed_version = Version(version)
+    if not version or not specifiers:
+        return False
 
-        return parsed_version in specifier_set
+    # Replace comma(s) and optional surrounding spaces with one space
+    specifiers = re.sub(r"\s*,\s*", " ", specifiers.strip())
 
-    except (InvalidVersion, InvalidSpecifier, TypeError) as e:
-        print(f"Version parsing error: {e}")
+    try:
+        # For nodesemver
+        return nodesemver.satisfies(
+            version, specifiers, include_prerelease=allow_prerelease
+        )
+    except ImportError:
+        try:
+            # For python-semver >=3.0.0
+            # semver>=3.0.0 supports allow_prerelease
+            return semver.satisfies(
+                version, specifiers, allow_prerelease=allow_prerelease
+            )
+        except Exception:
+            return False
+    except Exception:
         return False
 
 

{jvcli-2.0.21 → jvcli-2.0.22/jvcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvcli
-Version: 2.0.21
+Version: 2.0.22
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.
@@ -18,6 +18,8 @@ Requires-Dist: streamlit-elements>=0.1.0
 Requires-Dist: streamlit-router>=0.1.8
 Requires-Dist: streamlit-javascript>=0.1.5
 Requires-Dist: python-dotenv>=1.0.0
+Requires-Dist: semver>=3.0.4
+Requires-Dist: node-semver>=0.9.0
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"

{jvcli-2.0.21 → jvcli-2.0.22}/jvcli.egg-info/requires.txt

@@ -8,6 +8,8 @@ streamlit-elements>=0.1.0
 streamlit-router>=0.1.8
 streamlit-javascript>=0.1.5
 python-dotenv>=1.0.0
+semver>=3.0.4
+node-semver>=0.9.0
 
 [dev]
 pre-commit

{jvcli-2.0.21 → jvcli-2.0.22}/setup.py

@@ -46,6 +46,8 @@ setup(
         "streamlit-router>=0.1.8",
         "streamlit-javascript>=0.1.5",
         "python-dotenv>=1.0.0",
+        "semver>=3.0.4",
+        "node-semver>=0.9.0",
     ],
     extras_require={
         "dev": [

{jvcli-2.0.21 → jvcli-2.0.22}/tests/test_utils.py

@@ -224,20 +224,29 @@ class TestUtilsFullCoverage:
     @pytest.mark.parametrize(
         "version, spec, want",
         [
+            # Standard equality and range cases
             ("1.0.0", "1.0.0", True),
-            ("2.1.0", ">=2.0.0,<3.0.0", True),
+            ("2.1.0", ">=2.0.0,<3.0.0", True),  # comma within range
+            ("2.1.0", ">=2.0.0 <3.0.0", True),  # space within range
+            # Caret/Tilde matching (node-semver style)
             ("1.0.0", "^1.0.0", True),
             ("1.2.3", "~1.2.0", True),
+            ("1.3.0", "~1.2.0", False),
+            ("2.0.0", "^1.2.0", False),
+            ("0.3.0", "^0.2.0", False),
+            # Missing/empty/invalid input
             ("", "1.0.0", False),
             ("1.0.0", "", False),
             (None, "1.0.0", False),
             ("1.0.0", None, False),
             ("invalid", "1.0.0", False),
             ("1.0.0", "invalid", False),
-            ("1.0", ">=invalid", False),
-            ("1.3.0", "~1.2.0", False),
-            ("2.0.0", "^1.2.0", False),
-            ("0.3.0", "^0.2.0", False),
+            ("1.0", ">=invalid", False),  # invalid spec
+            # Specifier normalization with commas/spaces
+            ("1.2.3", ">=1.0.0, <2.0.0", True),  # comma
+            ("1.2.3", ">=1.0.0 <2.0.0", True),  # space
+            ("1.2.3", ">=1.0.0, <2.0.0, !=1.2.3", False),  # comma, exclusion
+            ("1.2.3", ">=1.0.0 !=1.2.3", False),  # space, exclusion
         ],
     )
     def test_is_version_compatible_general(
@@ -248,27 +257,25 @@ class TestUtilsFullCoverage:
 
     def test_is_version_compatible_pre_release(self) -> None:
         """Test is_version_compatible with pre-release versions."""
-        assert is_version_compatible("1.0.0-alpha", ">=1.0.0-alpha,<2.0.0")
-        assert not is_version_compatible("1.0.0-alpha", ">=1.0.0,<2.0.0")
-        assert is_version_compatible("1.0.0-beta", "^1.0.0-alpha")
-        assert is_version_compatible("1.0.0-alpha", "1.0.0-alpha")
-        assert not is_version_compatible("1.0.0-alpha", "1.0.0-beta")
+        # Pre-release in spec and version; allow_prerelease allows this
+        assert is_version_compatible("1.0.0-alpha", ">=1.0.0-alpha,<2.0.0", True)
+        # Should NOT match because allow_prerelease=False and pre-release only matches if explicitly specified
+        assert not is_version_compatible("1.0.0-alpha", ">=1.0.0,<2.0.0", False)
+        # Exact match on pre-release
+        assert is_version_compatible("1.0.0-alpha", "1.0.0-alpha", True)
+        # Non-matching pre-release
+        assert not is_version_compatible("1.0.0-alpha", "1.0.0-beta", False)
 
     def test_is_version_compatible_invalid_specifier(self) -> None:
         """Test is_version_compatible with invalid specifiers."""
 
-        # Test invalid tilde specifiers with insufficient release components
-        assert not is_version_compatible(
-            "1.0.0", "~1"
-        )  # Only major version, needs minor version too
-        assert not is_version_compatible("1.0.0", "~v1")  # Prefixed version
-        assert not is_version_compatible(
-            "1.0.0", "~1-alpha"
-        )  # Pre-release without minor
-        assert not is_version_compatible("1.0.0", "~a.b.c")  # Non-numeric version parts
+        # ~1 is not a valid node-semver range (must specify at least minor)
+        assert not is_version_compatible("1.0.0", "~1-alpha")
+        assert not is_version_compatible("1.0.0", "~a.b.c")
 
     def test_is_version_compatible_caret_with_zero_major_minor(self) -> None:
         """Test is_version_compatible with caret operator for 0.0.x versions."""
+
         # For ^0.0.1, only the exact version (and builds) should match
         assert is_version_compatible("0.0.1", "^0.0.1")
         assert is_version_compatible("0.0.1+build", "^0.0.1")
@@ -281,7 +288,7 @@ class TestUtilsFullCoverage:
         assert not is_version_compatible("0.1.0", "^0.0.1")
         assert not is_version_compatible("1.0.0", "^0.0.1")
 
-        # Different pattern: For ^0.0.0, only 0.0.0 should match
+        # For ^0.0.0, only 0.0.0 should match
         assert is_version_compatible("0.0.0", "^0.0.0")
         assert not is_version_compatible("0.0.1", "^0.0.0")