From c9ab26d3399fabddfb81d1c3580d46c3cef0cb70 Mon Sep 17 00:00:00 2001 From: "Nathan.Woodrow" Date: Fri, 21 Mar 2014 09:49:29 +1000 Subject: [PATCH] Fix project version checking. --- src/roam/project.py | 3 ++- tests/test_project.py | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/roam/project.py b/src/roam/project.py index c44e110d3..d3d19cae1 100644 --- a/src/roam/project.py +++ b/src/roam/project.py @@ -50,8 +50,9 @@ def versiontuple(v): min = versiontuple(roamversion) project = versiontuple(projectversion) + # Only match major for now because API is only broken between major versions. majormatch = min[0] == project[0] - return majormatch and (project > min or project == min) + return majormatch def getProjects(projectpath): diff --git a/tests/test_project.py b/tests/test_project.py index 8d88a161b..5ee26752e 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -4,7 +4,7 @@ import roam -minversion = '2.0.0' +minversion = '2.0.2' class TestVersionCheck: def test_should_return_invalid_for_version_less_then_min(self): @@ -16,6 +16,7 @@ def test_should_return_valid_for_version_higher_then_min(self): assert checkversion(minversion, projectversion) def test_should_return_valid_for_version_equal_to_min(self): + minversion = '2.0.0' projectversion = '2.0.0' assert checkversion(minversion, projectversion) @@ -25,4 +26,8 @@ def test_should_handle_two_part_versions(self): def test_should_return_valid_same_major_version(self): projectversion = '2.0' - assert checkversion(minversion, projectversion) \ No newline at end of file + assert checkversion(minversion, projectversion) + + def test_should_return_valid_same_patch_version(self): + projectversion = '2.0.0' + assert checkversion(minversion, projectversion)