MNT: compatibility with newer packaging

goerz · Apr 18, 2023 · cd744dc · cd744dc
1 parent f2500fa
commit cd744dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@ def get_version(filename):
 requirements = [
     'click >= 6.7',
     'jinja2',
-    'packaging < 22.0',
+    'packaging',
     'pyparsing >= 2.0.2',
     'setuptools',
     'sphinx',

diff --git a/src/docs_versions_menu/groups.py b/src/docs_versions_menu/groups.py
@@ -1,6 +1,5 @@
 """Classification of folders into groups according to :pep:`440`."""
-from packaging.version import LegacyVersion
-from packaging.version import parse as parse_version
+from packaging.version import InvalidVersion, Version
 
 
 def get_groups(folders, default_branches=None):
@@ -48,10 +47,11 @@ def get_groups(folders, default_branches=None):
         'default-branch': set(),
     }
     for folder in folders:
-        version = parse_version(folder)
-        if folder in default_branches:
-            groups['default-branch'].add(folder)
-        if isinstance(version, LegacyVersion):
+        try:
+            version = Version(folder)
+        except InvalidVersion:
+            if folder in default_branches:
+                groups['default-branch'].add(folder)
             groups['branches'].add(folder)
         else:
             groups['releases'].add(folder)