Skip to content

Commit c305be0

Browse files
bjoernricksy0urself
authored andcommitted
Remove: Remove unused version helper functions
1 parent 0f2d853 commit c305be0

File tree

2 files changed

+2
-126
lines changed

2 files changed

+2
-126
lines changed

pontos/version/helper.py

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,62 +17,11 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#
1919

20-
import re
2120
from typing import Optional
2221

23-
from packaging.version import InvalidVersion
24-
2522
from pontos.git import Git, TagSort
26-
from pontos.version.version import Version, parse_version
27-
28-
29-
def strip_version(version: str) -> str:
30-
"""
31-
Strips a leading 'v' from a version string
32-
33-
E.g. v1.2.3 will be converted to 1.2.3
34-
"""
35-
if version and version[0] == "v":
36-
return version[1:]
37-
38-
return version
39-
40-
41-
def check_develop(version: str) -> bool:
42-
"""
43-
Checks if the given Version is a develop version
44-
45-
Returns True if yes, False if not
46-
"""
47-
return True if Version(version).dev is not None else False
4823

49-
50-
def is_version_pep440_compliant(version: str) -> bool:
51-
"""
52-
Checks if the provided version is a
53-
`PEP 440 <https://www.python.org/dev/peps/pep-0440>`_ compliant version
54-
string
55-
"""
56-
return version == safe_version(version)
57-
58-
59-
def safe_version(version: str) -> str:
60-
"""
61-
Returns the version as a string in
62-
`PEP 440 <https://www.python.org/dev/peps/pep-0440>`_ compliant format.
63-
"""
64-
try:
65-
return str(Version(version))
66-
except InvalidVersion:
67-
version = version.replace(" ", ".")
68-
return re.sub("[^A-Za-z0-9.]+", "-", version)
69-
70-
71-
def versions_equal(new_version: str, old_version: str) -> bool:
72-
"""
73-
Checks if new_version and old_version are equal
74-
"""
75-
return safe_version(old_version) == safe_version(new_version)
24+
from .version import Version, parse_version
7625

7726

7827
def get_last_release_version(

tests/version/test_helper.py

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -19,83 +19,10 @@
1919
from unittest.mock import patch
2020

2121
from pontos.git.git import Git
22-
from pontos.version.helper import (
23-
get_last_release_version,
24-
is_version_pep440_compliant,
25-
safe_version,
26-
strip_version,
27-
)
22+
from pontos.version.helper import get_last_release_version
2823
from pontos.version.version import Version
2924

3025

31-
class IsVersionPep440CompliantTestCase(unittest.TestCase):
32-
def test_is_compliant(self):
33-
self.assertTrue(is_version_pep440_compliant("1.2.3.dev1"))
34-
self.assertTrue(is_version_pep440_compliant("1.2.3.dev0"))
35-
self.assertTrue(is_version_pep440_compliant("20.4"))
36-
self.assertTrue(is_version_pep440_compliant("1.2"))
37-
self.assertTrue(is_version_pep440_compliant("1.2.0a0"))
38-
self.assertTrue(is_version_pep440_compliant("1.2.0a1"))
39-
self.assertTrue(is_version_pep440_compliant("1.2.0b0"))
40-
self.assertTrue(is_version_pep440_compliant("1.2.0b1"))
41-
42-
def test_is_not_compliant(self):
43-
self.assertFalse(is_version_pep440_compliant("1.2.3dev1"))
44-
self.assertFalse(is_version_pep440_compliant("1.2.3dev"))
45-
self.assertFalse(is_version_pep440_compliant("1.2.3dev0"))
46-
self.assertFalse(is_version_pep440_compliant("1.2.3alpha"))
47-
self.assertFalse(is_version_pep440_compliant("1.2.3alpha0"))
48-
self.assertFalse(is_version_pep440_compliant("1.2.3.a0"))
49-
self.assertFalse(is_version_pep440_compliant("1.2.3beta"))
50-
self.assertFalse(is_version_pep440_compliant("1.2.3beta0"))
51-
self.assertFalse(is_version_pep440_compliant("1.2.3.b0"))
52-
self.assertFalse(is_version_pep440_compliant("20.04"))
53-
54-
55-
class SafeVersionTestCase(unittest.TestCase):
56-
def test_dev_versions(self):
57-
self.assertEqual(safe_version("1.2.3dev"), "1.2.3.dev0")
58-
self.assertEqual(safe_version("1.2.3dev1"), "1.2.3.dev1")
59-
self.assertEqual(safe_version("1.2.3.dev"), "1.2.3.dev0")
60-
61-
def test_alpha_versions(self):
62-
self.assertEqual(safe_version("1.2.3alpha"), "1.2.3a0")
63-
self.assertEqual(safe_version("1.2.3.alpha"), "1.2.3a0")
64-
self.assertEqual(safe_version("1.2.3a"), "1.2.3a0")
65-
self.assertEqual(safe_version("1.2.3.a1"), "1.2.3a1")
66-
self.assertEqual(safe_version("1.2.3a1"), "1.2.3a1")
67-
68-
def test_beta_versions(self):
69-
self.assertEqual(safe_version("1.2.3beta"), "1.2.3b0")
70-
self.assertEqual(safe_version("1.2.3.beta"), "1.2.3b0")
71-
self.assertEqual(safe_version("1.2.3b"), "1.2.3b0")
72-
self.assertEqual(safe_version("1.2.3.b1"), "1.2.3b1")
73-
self.assertEqual(safe_version("1.2.3b1"), "1.2.3b1")
74-
75-
def test_caldav_versions(self):
76-
self.assertEqual(safe_version("22.04"), "22.4")
77-
self.assertEqual(safe_version("22.4"), "22.4")
78-
self.assertEqual(safe_version("22.10"), "22.10")
79-
self.assertEqual(safe_version("22.04dev1"), "22.4.dev1")
80-
self.assertEqual(safe_version("22.10dev1"), "22.10.dev1")
81-
82-
def test_release_versions(self):
83-
self.assertEqual(safe_version("1"), "1")
84-
self.assertEqual(safe_version("1.2"), "1.2")
85-
self.assertEqual(safe_version("1.2.3"), "1.2.3")
86-
self.assertEqual(safe_version("22.4"), "22.4")
87-
88-
89-
class StripVersionTestCase(unittest.TestCase):
90-
def test_version_string_without_v(self):
91-
self.assertEqual(strip_version("1.2.3"), "1.2.3")
92-
self.assertEqual(strip_version("1.2.3dev"), "1.2.3dev")
93-
94-
def test_version_string_with_v(self):
95-
self.assertEqual(strip_version("v1.2.3"), "1.2.3")
96-
self.assertEqual(strip_version("v1.2.3dev"), "1.2.3dev")
97-
98-
9926
class GetLastReleaseVersionTestCase(unittest.TestCase):
10027
@patch("pontos.version.helper.Git", spec=Git)
10128
def test_get_last_release_version(self, _git_interface_mock):

0 commit comments

Comments
 (0)