aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatěj Cepl <mcepl@cepl.eu>2019-02-18 21:00:24 +0100
committerMatěj Cepl <mcepl@cepl.eu>2019-02-18 21:00:24 +0100
commit79a36ab7fce80f3e87ff94c95bd310d2fdcc802a (patch)
tree7ede7b3e494bc7da812a5612c567865be8527a85
parentb8c9dd088addd3cf623a0e2c511b2688101ad585 (diff)
downloaddlp_check_version_PyPI-79a36ab7fce80f3e87ff94c95bd310d2fdcc802a.tar.gz
Updates PEP484 types.
-rwxr-xr-xdlpcvp.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/dlpcvp.py b/dlpcvp.py
index 66b60cb..a7c9536 100755
--- a/dlpcvp.py
+++ b/dlpcvp.py
@@ -108,14 +108,17 @@ def parse_spec(spec_file: str, pkg: str) -> LooseVersion:
# rpm library generates awful lot of nonsensical goo on stderr
if isinstance(spec_file, bytes):
spec_file = spec_file.decode()
+
+ rest_of_line = ''
for line in spec_file.split('\n'):
if line.startswith('Version:'):
rest_of_line = line[len('Version:'):].strip()
+ break
return LooseVersion(rest_of_line)
-def get_spec_name(req: Request, pkg: str, etag: str = None) -> LooseVersion:
+def get_spec_name(req: Request, pkg: str, etag: str = None) -> Optional[str]:
# Acquire version from the listing of the project directory
spec_files = []
@@ -149,7 +152,7 @@ def get_spec_name(req: Request, pkg: str, etag: str = None) -> LooseVersion:
return
-def get_version_from_pypi(name: str, con: sqlite3.Connection = None) -> Optional[Tuple[str, str]]:
+def get_version_from_pypi(name: str, con: sqlite3.Connection = None) -> Optional[LooseVersion]:
"""
For the given name of module return the latest version available on PyPI.
"""
@@ -178,8 +181,7 @@ def get_version_from_pypi(name: str, con: sqlite3.Connection = None) -> Optional
raise
-def package_version(proj: str, pkg_name: str, con: sqlite3.Connection = None) \
- -> Optional[Tuple[str, str, str]]:
+def package_version(proj: str, pkg_name: str, con: sqlite3.Connection = None) -> LooseVersion:
"""
Return the version of the given package in the given proj.