diff options
| -rw-r--r-- | changes/feature-3224_code-in-release-builds | 1 | ||||
| -rw-r--r-- | src/leap/util/__init__.py | 28 | ||||
| -rw-r--r-- | src/leap/util/leap_argparse.py | 8 | ||||
| -rw-r--r-- | src/leap/util/tests/test_is_release_version.py | 57 |
4 files changed, 92 insertions, 2 deletions
diff --git a/changes/feature-3224_code-in-release-builds b/changes/feature-3224_code-in-release-builds new file mode 100644 index 00000000..5466d5ae --- /dev/null +++ b/changes/feature-3224_code-in-release-builds @@ -0,0 +1 @@ + o Added IS_RELEASE_VERSION flag that allows us to use code only in develop versions. Closes #3224. diff --git a/src/leap/util/__init__.py b/src/leap/util/__init__.py index 93eb714d..f39b52e9 100644 --- a/src/leap/util/__init__.py +++ b/src/leap/util/__init__.py @@ -20,10 +20,38 @@ Initializes version and app info, plus some small and handy functions. import datetime import os +from pkg_resources import parse_version + + +def _is_release_version(version): + """ + Helper to determine whether a version is a final release or not. + The release needs to be of the form: w.x.y.z containing only numbers + and dots. + + :param version: the version string + :type version: str + :returns: if the version is a release version or not. + :rtype: bool + """ + parsed_version = parse_version(version) + not_number = 0 + for x in parsed_version: + try: + int(x) + except: + not_number += 1 + + return not_number == 1 + + __version__ = "unknown" +IS_RELEASE_VERSION = False + try: from leap._version import get_versions __version__ = get_versions()['version'] + IS_RELEASE_VERSION = _is_release_version(__version__) del get_versions except ImportError: #running on a tree that has not run diff --git a/src/leap/util/leap_argparse.py b/src/leap/util/leap_argparse.py index 8300e4d8..db02e5e7 100644 --- a/src/leap/util/leap_argparse.py +++ b/src/leap/util/leap_argparse.py @@ -17,6 +17,8 @@ import argparse +from leap.util import IS_RELEASE_VERSION + def build_parser(): """ @@ -29,8 +31,10 @@ Launches the LEAP Client""", epilog=epilog) parser.add_argument('-d', '--debug', action="store_true", help=("Launches client in debug mode, writing debug" "info to stdout")) - parser.add_argument('--danger', action="store_true", - help=("Bypasses the certificate check for bootstrap")) + if not IS_RELEASE_VERSION: + help_text = "Bypasses the certificate check for bootstrap" + parser.add_argument('--danger', action="store_true", help=help_text) + parser.add_argument('-l', '--logfile', metavar="LOG FILE", nargs='?', action="store", dest="log_file", #type=argparse.FileType('w'), diff --git a/src/leap/util/tests/test_is_release_version.py b/src/leap/util/tests/test_is_release_version.py new file mode 100644 index 00000000..4199f603 --- /dev/null +++ b/src/leap/util/tests/test_is_release_version.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# test_is_release_version.py +# Copyright (C) 2013 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +""" +tests for _is_release_version function +""" + +import unittest +from leap.common.testing.basetest import BaseLeapTest +from leap.util import _is_release_version as is_release_version + + +class TestIsReleaseVersion(BaseLeapTest): + """Tests for release version check.""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def test_git_version(self): + version = '0.2.3-12-ge5b50a1' + self.assertFalse(is_release_version(version)) + + def test_release(self): + version = '0.2.4' + self.assertTrue(is_release_version(version)) + + def test_release_candidate(self): + version = '0.2.4-rc1' + self.assertFalse(is_release_version(version)) + + def test_complex_version(self): + version = '12.5.2.4-rc12.dev.alpha1' + self.assertFalse(is_release_version(version)) + + def test_super_high_version(self): + version = '12.5.2.4.45' + self.assertTrue(is_release_version(version)) + + +if __name__ == "__main__": + unittest.main(verbosity=2) |