Merge branch 'main' into datetime-scheme

Author: immqu

.github/workflows/pypi-release.yml

@@ -1,27 +1,28 @@
 name: Release library as a PyPI wheel and sdist on tag
 
 on:
-  release:
-    types: [created]
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*.*.*"
 
 jobs:
   build-and-publish-to-pypi:
     name: Build and publish library to PyPI
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-     - uses: actions/checkout@master
+     - uses: actions/checkout@v4
      - name: Set up Python
-       uses: actions/setup-python@v1
+       uses: actions/setup-python@v5
        with:
          python-version: 3.9
      - name: Install pypa/build
        run: python -m pip install build --user
      - name: Build a binary wheel and a source tarball
        run: python -m build --sdist --wheel --outdir dist/
-        .
      - name: Publish distribution  to PyPI
        if: startsWith(github.ref, 'refs/tags')
-       uses: pypa/gh-action-pypi-publish@master
+       uses: pypa/gh-action-pypi-publish@release/v1
        with:
          password: ${{ secrets.PYPI_API_TOKEN }}
 

CHANGELOG.rst

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+Version v31.1.1
+----------------
+
+- Update CI, change run OS for Pypi release to 22.04
+
+
+Version v31.1.0
+----------------
+
+- Introduce intdot versioning scheme
+- Add description to test fixture
+- Organize schema-based tests according to ecosystem
+- Use VERS test definition schema for tests
+
 Version v31.0.0
 ----------------
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = univers
-version = 31.0.0
+version = 31.1.0
 license = Apache-2.0 AND BSD-3-Clause AND MIT
 
 # description must be on ONE line https://github.com/pypa/setuptools/issues/1390

src/univers/version_range.py

@@ -1206,6 +1206,11 @@ class NoneVersionRange(VersionRange):
     version_class = versions.NoneVersion
 
 
+class LexicographicVersionRange(VersionRange):
+    scheme = "lexicographic"
+    version_class = versions.LexicographicVersion
+
+
 def from_gitlab_native(gitlab_scheme, string):
     purl_scheme = gitlab_scheme
     if gitlab_scheme not in PURL_TYPE_BY_GITLAB_SCHEME.values():
@@ -1452,6 +1457,7 @@ def build_range_from_snyk_advisory_string(scheme: str, string: Union[str, List])
     "none": NoneVersionRange,
     "intdot": IntdotVersionRange,
     "datetime": DatetimeVersionRange,
+    "lexicographic": LexicographicVersionRange,
 }
 
 PURL_TYPE_BY_GITLAB_SCHEME = {

src/univers/versions.py

@@ -147,6 +147,29 @@ def is_valid(cls, string):
         return string == "vers:none/*"
 
 
+class LexicographicVersion(Version):
+    @classmethod
+    def build_value(cls, string):
+        return str(string)
+
+    """
+    Create a string, even if, e.g., an integer is given
+    """
+
+    @classmethod
+    def normalize(cls, string):
+        return remove_spaces(str(string))
+
+    def __lt__(self, other):
+        return self.value.encode("utf-8") < other.value.encode("utf-8")
+
+    def __gt__(self, other):
+        return self.value.encode("utf-8") > other.value.encode("utf-8")
+
+    def __eq__(self, other):
+        return self.value.encode("utf-8") == other.value.encode("utf-8")
+
+
 class IntdotVersion(Version):
     @classmethod
     def build_value(cls, string):
@@ -738,4 +761,5 @@ def bump(self, index):
     AlpineLinuxVersion,
     IntdotVersion,
     DatetimeVersion,
+    LexicographicVersion,
 ]

tests/test_version_range.py

@@ -24,6 +24,7 @@
 from univers.version_range import from_gitlab_native
 from univers.versions import DatetimeVersion
 from univers.versions import IntdotVersion
+from univers.versions import LexicographicVersion
 from univers.versions import OpensslVersion
 from univers.versions import PypiVersion
 from univers.versions import SemverVersion
@@ -408,3 +409,12 @@ def test_version_range_datetime():
     assert DatetimeVersion("2001-01-01T01:02:03Z") in datetime_constraints
     with pytest.raises(Exception):
         VersionRange.from_string("vers:datetime/2025-08-25")
+
+
+def test_version_range_lexicographic():
+    assert LexicographicVersion("1.2.3") in VersionRange.from_string(
+        "vers:lexicographic/<1.2.4|>0.9"
+    )
+    assert LexicographicVersion(-123) in VersionRange.from_string("vers:lexicographic/<~")
+    assert LexicographicVersion(None) in VersionRange.from_string("vers:lexicographic/*")
+    assert LexicographicVersion("ABC") in VersionRange.from_string("vers:lexicographic/>abc|<=None")

tests/test_versions.py

@@ -14,6 +14,7 @@
 from univers.versions import GentooVersion
 from univers.versions import GolangVersion
 from univers.versions import IntdotVersion
+from univers.versions import LexicographicVersion
 from univers.versions import MavenVersion
 from univers.versions import NginxVersion
 from univers.versions import NugetVersion
@@ -242,3 +243,13 @@ def test_datetime_version():
     assert DatetimeVersion("2023-10-28T19:30:00+01:00") == DatetimeVersion("2023-10-28T18:30:00Z")
     assert not DatetimeVersion.is_valid("2023-10-28Z19:30:00+01:00")
     assert not DatetimeVersion.is_valid("10-10-2023T19:30:00+01:00")
+
+
+def test_lexicographic_version():
+    assert LexicographicVersion("abc") == LexicographicVersion("abc")
+    assert LexicographicVersion(" abc") == LexicographicVersion("abc")
+    assert LexicographicVersion("123") == LexicographicVersion(123)
+    assert LexicographicVersion("abc") > LexicographicVersion(None)
+    assert LexicographicVersion("Abc") < LexicographicVersion(None)
+    assert LexicographicVersion("123") < LexicographicVersion("bbc")
+    assert LexicographicVersion("2.3.4") > LexicographicVersion("1.2.3")