Use Python packaging version parser

bulletmark · bulletmark · commit 3c54ba6ae2c9 · 2022-10-15T11:46:39.000+10:00
Was doing my own version compare but ultimately not robust enough.
diff --git a/README.md b/README.md
@@ -53,10 +53,11 @@ https://github.com/bulletmark/debugpy-run.
 Arch users can install [debugpy-run from the
 AUR](https://aur.archlinux.org/packages/debugpy-run/).
 
-Python 3.6 or later is required. Note [debugpy-run is on
-PyPI](https://pypi.org/project/debugpy-run/) so just ensure that
-`python3-pip` and `python3-wheel` are installed then type the following
-to install (or upgrade):
+Python 3.6 or later is required. Also, the Python
+[packaging](https://pypi.org/project/packaging/) module is required.
+Note [debugpy-run is on PyPI](https://pypi.org/project/debugpy-run/) so
+just ensure that `python3-pip` and `python3-wheel` are installed then
+type the following to install (or upgrade):
 
 ```
 $ sudo pip3 install -U debugpy-run
diff --git a/debugpy_run.py b/debugpy_run.py
@@ -12,14 +12,18 @@
 import subprocess
 import re
 from pathlib import Path
+from packaging import version
+
 
 PROG = 'debugpy'
+EXTNAME = 'ms-python.python'
 
 def find_ext_debugger():
     'Find where debugger is located in extensions'
     pdirs = list(Path('~').expanduser().glob(
-        '.vscode*/extensions/ms-python.python-*'))
+        f'.vscode*/extensions/{EXTNAME}-*'))
 
+    # Filter out to dirs only
     if pdirs:
         pdirs = [d for d in pdirs if d.is_dir()]
 
@@ -28,9 +32,9 @@ def find_ext_debugger():
 
     def sortdir(val):
         'Calculate a sort hash for given dir'
-        valstr = re.sub(r'^.*?([0-9])', r'\1', str(val))
-        v = valstr.split('.', maxsplit=3)
-        return f'{v[0]}.{int(v[1]):02}.{v[2]}'
+        sval = re.sub(f'^.*/{EXTNAME}-', '', str(val))
+        sval = re.sub('/.*$', '', sval)
+        return version.parse(sval)
 
     extdir = sorted(pdirs, reverse=True, key=sortdir)[0]
     pkg = extdir / f'pythonFiles/lib/python/{PROG}'
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name=name,
-    version='1.5',
+    version='1.5.1',
     description='Finds and runs debugpy for VS Code "remote attach" '
             'command line debugging.',
     long_description=here.joinpath('README.md').read_text(),
@@ -23,6 +23,7 @@
     license='GPLv3',
     py_modules=[module],
     python_requires='>=3.6',
+    install_requires=['packaging'],
     classifiers=[
         'Programming Language :: Python :: 3',
     ],
