Merge pull request #859 from valory-xyz/feat/remove-semver-dependency

chore: remove semver dependency

Author: DavidMinarsch

aea/cli/generate_all_protocols.py

@@ -43,7 +43,7 @@
 from typing import Any, List, Tuple, cast
 
 import click
-import semver
+from packaging.version import Version
 
 from aea.cli.registry.utils import download_file, extract, request_api
 from aea.common import JSONLike
@@ -276,8 +276,8 @@ def _bump_protocol_specification_id(
 ) -> None:
     """Bump spec id version."""
     spec_id: PublicId = configuration.protocol_specification_id  # type: ignore
-    old_version = semver.VersionInfo.parse(spec_id.version)
-    new_version = str(old_version.bump_minor())
+    old_version = Version(spec_id.version)
+    new_version = f"{old_version.major}.{old_version.minor + 1}.0"
     new_spec_id = PublicId(spec_id.author, spec_id.name, new_version)
     configuration.protocol_specification_id = new_spec_id
     with (package_path / DEFAULT_PROTOCOL_CONFIG_FILE).open("w") as file_output:

aea/configurations/data_types.py

@@ -38,8 +38,8 @@
     cast,
 )
 
-import semver
 from packaging.specifiers import SpecifierSet
+from packaging.version import Version
 
 from aea.configurations.constants import (
     AGENT,
@@ -62,7 +62,7 @@
 )
 
 T = TypeVar("T")
-PackageVersionLike = Union[str, semver.VersionInfo]
+PackageVersionLike = Union[str, Version]
 
 PACKAGE_NAME_RE = r"[a-zA-Z0-9_-]+"
 VERSION_SPECIFIER_RE = r"(>|<|=|~|\*)+.*"
@@ -117,13 +117,13 @@ def __init__(self, version_like: PackageVersionLike) -> None:
         """
         Initialize a package version.
 
-        :param version_like: a string, os a semver.VersionInfo object.
+        :param version_like: a string, or a packaging.version.Version object.
         """
         if isinstance(version_like, str) and version_like in ("any", "latest"):
             self._version = version_like
         elif isinstance(version_like, str):
-            self._version = semver.VersionInfo.parse(version_like)
-        elif isinstance(version_like, semver.VersionInfo):
+            self._version = Version(version_like)
+        elif isinstance(version_like, Version):
             self._version = version_like
         else:
             raise ValueError("Version type not valid.")

aea/configurations/schemas/definitions.json

@@ -74,7 +74,7 @@
     },
     "semantic_version": {
       "type": "string",
-      "description": "A semantic version number. See https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string",
+      "description": "A version string. Supports PEP 440 versions (MAJOR.MINOR.PATCH with optional pre-release suffixes like rc1, a1, b1).",
       "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
     },
     "pep440_version": {

docs/api/configurations/data_types.md

@@ -61,7 +61,7 @@ Initialize a package version.
 
 **Arguments**:
 
-- `version_like`: a string, os a semver.VersionInfo object.
+- `version_like`: a string, or a packaging.version.Version object.
 
 <a id="aea.configurations.data_types.PackageVersion.is_any"></a>
 

docs/config.md

@@ -14,7 +14,7 @@ The `aea-config.yaml` defines the AEA project. The compulsory components are lis
 ``` yaml
 agent_name: my_agent                            # Name of the AEA project (must satisfy PACKAGE_REGEX)
 author: fetchai                                 # Author handle of the project's author (must satisfy AUTHOR_REGEX)
-version: 0.1.0                                  # Version of the AEA project (a semantic version number, see https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string")
+version: 0.1.0                                  # Version of the AEA project (a version in MAJOR.MINOR.PATCH format, see PEP 440)
 description: A demo project                     # Description of the AEA project
 license: Apache-2.0                             # License of the AEA project
 aea_version: '>=2.0.0, <3.0.0'               # AEA framework version(s) compatible with the AEA project (a version number that matches PEP 440 version schemes, or a comma-separated list of PEP 440 version specifiers, see https://www.python.org/dev/peps/pep-0440/#version-specifiers)
@@ -91,7 +91,7 @@ The `connection.yaml`, which is present in each connection package, has the foll
 ``` yaml
 name: scaffold                                  # Name of the package (must satisfy PACKAGE_REGEX)
 author: fetchai                                 # Author handle of the package's author (must satisfy AUTHOR_REGEX)
-version: 0.1.0                                  # Version of the package (a semantic version number, see https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string")
+version: 0.1.0                                  # Version of the package (a version in MAJOR.MINOR.PATCH format, see PEP 440)
 type: connection                                # The type of the package; for connections, it must be "connection"
 description: A scaffold connection              # Description of the package
 license: Apache-2.0                             # License of the package
@@ -117,7 +117,7 @@ The `contract.yaml`, which is present in each contract package, has the followin
 ``` yaml
 name: scaffold                                  # Name of the package (must satisfy PACKAGE_REGEX)
 author: fetchai                                 # Author handle of the package's author (must satisfy AUTHOR_REGEX)
-version: 0.1.0                                  # Version of the package (a semantic version number, see https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string")
+version: 0.1.0                                  # Version of the package (a version in MAJOR.MINOR.PATCH format, see PEP 440)
 type: contract                                  # The type of the package; for contracts, it must be "contract"
 description: A scaffold contract                # Description of the package
 license: Apache-2.0                             # License of the package
@@ -139,7 +139,7 @@ The `protocol.yaml`, which is present in each protocol package, has the followin
 ``` yaml
 name: scaffold                                  # Name of the package (must satisfy PACKAGE_REGEX)
 author: fetchai                                 # Author handle of the package's author (must satisfy AUTHOR_REGEX)
-version: 0.1.0                                  # Version of the package (a semantic version number, see https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string")
+version: 0.1.0                                  # Version of the package (a version in MAJOR.MINOR.PATCH format, see PEP 440)
 type: protocol                                  # The type of the package; for protocols, it must be "protocol" 
 description: A scaffold protocol                # Description of the package
 license: Apache-2.0                             # License of the package
@@ -158,7 +158,7 @@ The `skill.yaml`, which is present in each protocol package, has the following r
 ``` yaml
 name: scaffold                                  # Name of the package (must satisfy PACKAGE_REGEX)
 author: fetchai                                 # Author handle of the package's author (must satisfy AUTHOR_REGEX)
-version: 0.1.0                                  # Version of the package (a semantic version number, see https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string")
+version: 0.1.0                                  # Version of the package (a version in MAJOR.MINOR.PATCH format, see PEP 440)
 type: skill                                     # The type of the package; for skills, it must be "skill"
 description: A scaffold skill                   # Description of the package
 license: Apache-2.0                             # License of the package

scripts/update_package_versions.py

@@ -38,9 +38,9 @@
 from typing import Any, Dict, List, Optional, Pattern, Set
 
 import click
-import semver
 import yaml
 from click.testing import CliRunner
+from packaging.version import Version
 
 from aea.cli import cli
 from aea.cli.ipfs_hash import update_hashes
@@ -397,7 +397,7 @@ def _sort_in_update_order(package_ids: Set[PackageId]) -> List[PackageId]:
     return sorted(
         package_ids,
         key=lambda x: (
-            semver.VersionInfo.parse(x.public_id.version),
+            Version(x.public_id.version),
             x.public_id.author,
             x.public_id.name,
             x.package_type.value,
@@ -410,8 +410,9 @@ def minor_version_difference(
     current_public_id: PublicId, deployed_public_id: PublicId
 ) -> int:
     """Check the minor version difference."""
-    diff = semver.compare(current_public_id.version, deployed_public_id.version)
-    return diff
+    current = Version(current_public_id.version)
+    deployed = Version(deployed_public_id.version)
+    return (current > deployed) - (current < deployed)
 
 
 def _can_disambiguate_from_context(
@@ -705,7 +706,7 @@ def process_package(self, package_id: PackageId, is_ambiguous: bool) -> None:
     def get_new_package_version(self, current_public_id: PublicId) -> str:
         """Get new package version according to command line options provided."""
 
-        ver = semver.VersionInfo.parse(current_public_id.version)
+        ver = Version(current_public_id.version)
 
         if self.option_ask_version:
             while True:
@@ -714,7 +715,7 @@ def get_new_package_version(self, current_public_id: PublicId) -> str:
                 )
 
                 try:
-                    new_ver = semver.VersionInfo.parse(new_version)
+                    new_ver = Version(new_version)
                     if new_ver <= ver:
                         print("Version is lower or the same. Enter a new one.")
                         continue
@@ -723,9 +724,9 @@ def get_new_package_version(self, current_public_id: PublicId) -> str:
                     print(f"Version parse error: {e}. Enter a new one")
                     continue
         elif self.option_update_version == "minor":
-            new_version = ver.bump_minor()
+            new_version = f"{ver.major}.{ver.minor + 1}.0"
         elif self.option_update_version == "patch":
-            new_version = ver.bump_patch()
+            new_version = f"{ver.major}.{ver.minor}.{ver.micro + 1}"
         else:
             raise RuntimeError("unknown version update mode")
 

setup.cfg

@@ -79,9 +79,6 @@ ignore_errors = True
 [mypy-oef.*]
 ignore_missing_imports = True
 
-[mypy-semver.*]
-ignore_missing_imports = True
-
 [mypy-eth_keys.*]
 ignore_missing_imports = True
 

setup.py

@@ -37,7 +37,6 @@ def get_all_extras() -> Dict:
         "pytest>=8.2,<10",
         "coverage>=6.4.4,<8.0.0",
         "jsonschema<4.24.0,>=4.20.0",
-        "semver>=2.9.1,<3.0.0",
     ]
 
     extras = {
@@ -53,7 +52,6 @@ def get_all_extras() -> Dict:
 all_extras = get_all_extras()
 
 base_deps = [
-    "semver>=2.9.1,<3.0.0",
     "base58>=1.0.3,<3.0.0",
     "jsonschema<4.24.0,>=4.20.0",
     "packaging==26",

tests/strategies/data_types.py

@@ -22,9 +22,9 @@
 import collections
 import re
 
-import semver
 from hypothesis import strategies as st
 from packaging.specifiers import Specifier, SpecifierSet
+from packaging.version import Version
 
 from aea.configurations.data_types import (
     ComponentId,
@@ -58,7 +58,7 @@
 
 
 version_info_strategy = st.builds(
-    lambda kwargs: semver.VersionInfo(**kwargs),
+    lambda kwargs: Version(f"{kwargs['major']}.{kwargs['minor']}.{kwargs['patch']}"),
     st.fixed_dictionaries(
         dict(
             major=positive_integer_strategy,
@@ -67,7 +67,7 @@
         ),
     ),
 )
-st.register_type_strategy(semver.VersionInfo, version_info_strategy)
+st.register_type_strategy(Version, version_info_strategy)
 
 
 package_version_strategy = st.builds(
@@ -81,7 +81,7 @@
     dict(
         author=st.from_type(SimpleId),
         name=st.from_type(SimpleId),
-        version=st.from_type(semver.VersionInfo),
+        version=st.from_type(Version),
         package_hash=st.from_type(IPFSHash),
     )
 )

tests/test_configurations/test_base.py

@@ -31,7 +31,6 @@
 from unittest.mock import Mock
 
 import pytest
-import semver
 import yaml
 from packaging.specifiers import SpecifierSet
 
@@ -609,8 +608,10 @@ def test_configuration_ordered_json():
 
 def test_public_id_versions():
     """Test that a public id version can be initialized with different objects."""
+    from packaging.version import Version
+
     PublicId("author", "name", "0.1.0")
-    PublicId("author", "name", semver.VersionInfo(major=0, minor=1, patch=0))
+    PublicId("author", "name", Version("0.1.0"))
 
 
 def test_public_id_invalid_version():
@@ -1010,6 +1011,54 @@ def test_package_version_lt():
     assert v1 < v2 < v3
 
 
+def test_package_version_from_version_object():
+    """Test PackageVersion accepts packaging.version.Version objects."""
+    from packaging.version import Version
+
+    v = Version("1.2.3")
+    pv = PackageVersion(v)
+    assert str(pv) == "1.2.3"
+
+    # Comparison with string-constructed version
+    pv_str = PackageVersion("1.2.3")
+    assert pv == pv_str
+
+    # Ordering
+    pv_lower = PackageVersion(Version("1.1.0"))
+    pv_higher = PackageVersion(Version("2.0.0"))
+    assert pv_lower < pv < pv_higher
+
+    # str round-trip
+    assert PackageVersion(str(pv)) == pv
+
+
+def test_package_version_str_format():
+    """Test PackageVersion string representation matches semver format."""
+    cases = ["0.1.0", "1.0.0", "1.2.3", "10.20.30"]
+    for version_str in cases:
+        pv = PackageVersion(version_str)
+        assert str(pv) == version_str
+
+
+def test_package_version_rejects_non_pep440():
+    """Test that non-PEP 440 semver prerelease forms are rejected explicitly."""
+    from packaging.version import InvalidVersion
+
+    exotic = ["1.0.0-0.3.7", "1.0.0-x.7.z.92"]
+    for version_str in exotic:
+        with pytest.raises(InvalidVersion):
+            PackageVersion(version_str)
+
+
+def test_public_id_with_version_object():
+    """Test PublicId can be initialized with a packaging.version.Version."""
+    from packaging.version import Version
+
+    pid = PublicId("author", "name", Version("0.1.0"))
+    assert str(pid.package_version) == "0.1.0"
+    assert pid == PublicId("author", "name", "0.1.0")
+
+
 class TestDependencyGetPipInstallArgs:
     """Test 'get_pip_install_args' of 'Dependency' class."""