Merge pull request #1120 from stonebig/master

stonebig · web-flow · commit a88b5161a43c · 2022-10-16T19:05:34.000+02:00
one re.split to split them all
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '5.0.20220918'
+__version__ = '5.0.20221016'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/piptree.py b/winpython/piptree.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import json, sys, re, platform, os
+import re
 from winpython import utils
 from collections import OrderedDict
 from pip._vendor.packaging.markers import Marker
@@ -53,7 +54,13 @@ def __init__(self):
             if "requires_dist" in meta:
                 for i in meta["requires_dist"]:
                     det = (i + ";").split(";")
-                    req_nameextra = normalize((det[0] + " ").split(" ")[0])
+                    
+                    # req_nameextra is "python-jose[cryptography]"
+                    #  from fastapi "python-jose[cryptography]<4.0.0,>=3.3.0
+                    # req_nameextra is "google-cloud-storage" 
+                    #   from "google-cloud-storage (<2.0.0,>=1.26.0)
+                    req_nameextra = re.split(' |;|==|!|>|<', det[0]+ ";")[0]
+                    req_nameextra = normalize(req_nameextra)
                     req_key = normalize((req_nameextra + "[").split("[")[0])
                     req_key_extra = req_nameextra[len(req_key) + 1 :].split("]")[0]
                     req_version = det[0][len(req_nameextra) :].translate(replacements)
