Title: [290261] trunk/Tools
- Revision
- 290261
- Author
- jbed...@apple.com
- Date
- 2022-02-21 12:42:43 -0800 (Mon, 21 Feb 2022)
Log Message
[webkitcorepy] Support local library in existing path
https://bugs.webkit.org/show_bug.cgi?id=236978
<rdar://problem/89237767>
Reviewed by Dewei Zhu.
* Tools/Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(AutoInstall.register): Handle case where library is in an exisiting sys.path.
Canonical link: https://commits.webkit.org/247586@main
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (290260 => 290261)
--- trunk/Tools/ChangeLog 2022-02-21 20:11:29 UTC (rev 290260)
+++ trunk/Tools/ChangeLog 2022-02-21 20:42:43 UTC (rev 290261)
@@ -1,3 +1,16 @@
+2022-02-21 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitcorepy] Support local library in existing path
+ https://bugs.webkit.org/show_bug.cgi?id=236978
+ <rdar://problem/89237767>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (AutoInstall.register): Handle case where library is in an exisiting sys.path.
+
2022-02-17 Jonathan Bedard <jbed...@apple.com>
[run-webkit-tests] Use Python 3 (Part 1)
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/setup.py (290260 => 290261)
--- trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2022-02-21 20:11:29 UTC (rev 290260)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/setup.py 2022-02-21 20:42:43 UTC (rev 290261)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.13.0',
+ version='0.13.1',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (290260 => 290261)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2022-02-21 20:11:29 UTC (rev 290260)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2022-02-21 20:42:43 UTC (rev 290261)
@@ -44,7 +44,7 @@
from webkitcorepy.editor import Editor
from webkitcorepy.file_lock import FileLock
-version = Version(0, 13, 0)
+version = Version(0, 13, 1)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
Modified: trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (290260 => 290261)
--- trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2022-02-21 20:11:29 UTC (rev 290260)
+++ trunk/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2022-02-21 20:42:43 UTC (rev 290261)
@@ -563,16 +563,18 @@
if local:
if package.name == 'autoinstalled':
raise ValueError("local package name 'autoinstalled' is forbidden")
- libraries = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+ containing_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+ libraries = os.path.dirname(containing_path)
checkout_root = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(libraries))))
for candidate in [
+ containing_path,
os.path.join(libraries, package.pypi_name),
os.path.join(checkout_root, 'Internal', 'Tools', 'Scripts', 'libraries', package.pypi_name),
]:
- if candidate in sys.path:
- return package
if not os.path.isdir(os.path.join(candidate, package.name)):
continue
+ if candidate in sys.path:
+ return [package]
sys.path.insert(0, candidate)
return [package]
else:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
