Skip to content

Commit c92fe44

Browse files
committed
Fix nuget string representation
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 033e23f commit c92fe44

3 files changed

Lines changed: 19 additions & 2 deletions

File tree

src/univers/versions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ def is_valid(cls, string):
305305
except ValueError:
306306
return False
307307

308+
def __str__(self):
309+
return str(self.string)
310+
308311
def __lt__(self, other):
309312
return nuget.Version.from_string(self.string) < nuget.Version.from_string(other.string)
310313

tests/test_nuget.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# https://github.com/NuGet/NuGet.Client/blob/dev/test/NuGet.Core.Tests/NuGet.Versioning.Test/VersionComparerTests.cs
1919

2020
import unittest
21-
from univers import nuget
21+
from univers.versions import NugetVersion
2222

2323

2424
class NuGetTest(unittest.TestCase):
@@ -29,7 +29,7 @@ def setUp(self):
2929

3030
def check_order(self, comparison, first, second):
3131
"""Check order."""
32-
comparison(nuget.Version.from_string(first), nuget.Version.from_string(second))
32+
comparison(NugetVersion.build_value(first), NugetVersion.build_value(second))
3333

3434
def test_equals(self):
3535
"""Test version equals."""

tests/test_version_range.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99

1010
from univers.version_constraint import VersionConstraint
1111
from univers.version_range import GemVersionRange
12+
from univers.version_range import NugetVersionRange
1213
from univers.version_range import InvalidVersionRange
1314
from univers.version_range import PypiVersionRange
1415
from univers.version_range import VersionRange
1516
from univers.version_range import RANGE_CLASS_BY_SCHEMES
1617
from univers.version_range import NpmVersionRange
1718
from univers.version_range import OpensslVersionRange
1819
from univers.versions import PypiVersion
20+
from univers.versions import NugetVersion
1921
from univers.versions import RubygemsVersion
2022
from univers.versions import SemverVersion
2123
from univers.versions import OpensslVersion
@@ -262,6 +264,18 @@ def test_OpensslVersionRange_from_versions(self):
262264
version_range = OpensslVersionRange.from_versions(sequence)
263265
assert version_range == expected
264266

267+
def test_nuget_version_range(self):
268+
nuget_range = "[1.0.0, 2.0.0)"
269+
expected = NugetVersionRange(
270+
constraints=(
271+
VersionConstraint(comparator=">=", version=NugetVersion(string="1.0.0")),
272+
VersionConstraint(comparator="<", version=NugetVersion(string="2.0.0")),
273+
)
274+
)
275+
version_range = NugetVersionRange.from_native(nuget_range)
276+
assert version_range == expected
277+
assert version_range.to_string() == "vers:nuget/>=1.0.0|<2.0.0"
278+
265279

266280
VERSION_RANGE_TESTS_BY_SCHEME = {
267281
"nginx": ["0.8.40+", "0.7.52-0.8.39", "0.9.10", "1.5.0+, 1.4.1+"],

0 commit comments

Comments
 (0)