Unverified Commit 64d172b8 authored by Sébastien Eustace's avatar Sébastien Eustace
Browse files

Fix tilde operator parsing in semver package

parent cdda1393
Loading
Loading
Loading
Loading
+1 −1
Changes for poetry/semver/version_parser.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ class VersionParser:
            elif m.group(3):
                position = 2
            elif m.group(2):
                position = 1
                position = 2
            else:
                position = 0

+1 −1
Changes for tests/mixology/fixtures/case/django.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
      "dependencies": [
        {
          "name": "django",
          "version": "1.4.1",
          "version": "1.4.3",
          "dependencies": [

          ]
+4 −4
Changes for tests/semver/test_main.py: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ from poetry.semver import sort, rsort, statisfies, satisfied_by
        ('2.1.3', '1.2.* || 2.*'),
        ('1.2.3', '1.2.* || 2.*'),
        ('1.2.3', '*'),
        ('2.9.0', '~2.4'),  # >= 2.4.0 < 3.0.0
        ('2.9.0', '^2.4'),  # >= 2.4.0 < 3.0.0
        ('2.4.5', '~2.4'),
        ('1.2.3', '~1'),  # >= 1.0.0 < 2.0.0
        ('1.4.7', '~1.0'),  # >= 1.0.0 < 2.0.0
        ('1.0.7', '~1.0'),  # >= 1.0.0 < 1.1.0
        ('1.0.0', '>=1'),
        ('1.0.0', '>= 1'),
        ('1.2.8', '>1.2'),  # > 1.2.0
@@ -135,8 +135,8 @@ def test_statisfies_negative(version, constraint):
    [
        (
            '~1.0',
            ['1.0', '1.2', '1.9999.9999', '2.0', '2.1', '0.9999.9999'],
            ['1.0', '1.2', '1.9999.9999'],
            ['1.0', '1.0.9', '1.2', '2.0', '2.1', '0.9999.9999'],
            ['1.0', '1.0.9'],
        ),
        (
            '>1.0 <3.0 || >=4.0',
+5 −4
Changes for tests/semver/test_version_parser.py: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -64,13 +64,14 @@ def test_parse_constraints_wildcard(parser, input, min, max):
    'input,min,max',
    [
        ('~v1', Constraint('>=', '1.0.0.0'), Constraint('<', '2.0.0.0')),
        ('~1.0', Constraint('>=', '1.0.0.0'), Constraint('<', '2.0.0.0')),
        ('~1.0', Constraint('>=', '1.0.0.0'), Constraint('<', '1.1.0.0')),
        ('~1.0.0', Constraint('>=', '1.0.0.0'), Constraint('<', '1.1.0.0')),
        ('~1.2', Constraint('>=', '1.2.0.0'), Constraint('<', '2.0.0.0')),
        ('~1.2', Constraint('>=', '1.2.0.0'), Constraint('<', '1.3.0.0')),
        ('~1.2.3', Constraint('>=', '1.2.3.0'), Constraint('<', '1.3.0.0')),
        ('~1.2.3.4', Constraint('>=', '1.2.3.4'), Constraint('<', '1.2.4.0')),
        ('~1.2-beta', Constraint('>=', '1.2.0.0-beta'), Constraint('<', '2.0.0.0')),
        ('~1.2-b2', Constraint('>=', '1.2.0.0-beta.2'), Constraint('<', '2.0.0.0')),
        ('~1.2-beta', Constraint('>=', '1.2.0.0-beta'), Constraint('<', '1.3.0.0')),
        ('~1.2-b2', Constraint('>=', '1.2.0.0-beta.2'), Constraint('<', '1.3.0.0')),
        ('~0.3', Constraint('>=', '0.3.0.0'), Constraint('<', '0.4.0.0')),
    ]
)
def test_parse_constraints_tilde(parser, input, min, max):