Merge pull request winpython#1367 from stonebig/master

stonebig · web-flow · commit abcb06fa50b7 · 2024-07-07T20:25:03.000+02:00
prepare b2, numpy-2
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '9.0.20240629'
+__version__ = '9.0.20240707'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/piptree.py b/winpython/piptree.py
@@ -205,7 +205,7 @@ def _upraw(self, pp, extra="", version_req="", depth=20, path=[], verbose=False)
                     # {'req_key': 'langchain',  'req_version': '(>=1.26.0,<2.0.0)', 'req_extra': '', 'req_marker': ' python_version >= "3.12"'}
                     # must be no extra dependancy, optionnal extra in the package, or provided extra per upper packages 
                     if ("req_marker" not in r and extra =="") or (extra !="" and extra==up_req and r["req_key"]!=p)  or (extra !="" and "req_marker" in r and extra+',' in r["req_extra"]+',' #bingo1346 contourpy[test-no-images]
-                        or  extra+',' in r["req_extra"]+','  and Marker(r["req_marker"]).evaluate(environment=envi)
+                        or "req_marker" in r and extra+',' in r["req_extra"]+','  and Marker(r["req_marker"]).evaluate(environment=envi)
                         ):
                         ret += self._upraw(
                             r["req_key"],
