Title: [273360] branches/safari-611-branch/Tools
- Revision
- 273360
- Author
- ryanhad...@apple.com
- Date
- 2021-02-23 17:05:24 -0800 (Tue, 23 Feb 2021)
Log Message
Cherry-pick r271630. rdar://problem/74668621
[webkitcorepy] Support alternative default pypi url on macOS
https://bugs.webkit.org/show_bug.cgi?id=220744
<rdar://problem/73369338>
Reviewed by Aakash Jain.
* Scripts/libraries/webkitcorepy/setup.py: Bump version.
* Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
* Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
(_default_pypi_index): Pull default pypi index from pip.conf, if available.
(AutoInstall): Set index based on result of _default_pypi_index.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271630 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Tools/ChangeLog (273359 => 273360)
--- branches/safari-611-branch/Tools/ChangeLog 2021-02-24 01:02:44 UTC (rev 273359)
+++ branches/safari-611-branch/Tools/ChangeLog 2021-02-24 01:05:24 UTC (rev 273360)
@@ -1,3 +1,36 @@
+2021-02-23 Ryan Haddad <ryanhad...@apple.com>
+
+ Cherry-pick r271630. rdar://problem/74668621
+
+ [webkitcorepy] Support alternative default pypi url on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=220744
+ <rdar://problem/73369338>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (_default_pypi_index): Pull default pypi index from pip.conf, if available.
+ (AutoInstall): Set index based on result of _default_pypi_index.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271630 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-01-19 Jonathan Bedard <jbed...@apple.com>
+
+ [webkitcorepy] Support alternative default pypi url on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=220744
+ <rdar://problem/73369338>
+
+ Reviewed by Aakash Jain.
+
+ * Scripts/libraries/webkitcorepy/setup.py: Bump version.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py: Ditto.
+ * Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py:
+ (_default_pypi_index): Pull default pypi index from pip.conf, if available.
+ (AutoInstall): Set index based on result of _default_pypi_index.
+
2021-02-17 Ruben Turcios <rubent...@apple.com>
Cherry-pick r272165. rdar://problem/74032536
Modified: branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/setup.py (273359 => 273360)
--- branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-02-24 01:02:44 UTC (rev 273359)
+++ branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/setup.py 2021-02-24 01:05:24 UTC (rev 273360)
@@ -30,7 +30,7 @@
setup(
name='webkitcorepy',
- version='0.4.26',
+ version='0.4.27',
description='Library containing various Python support classes and functions.',
long_description=readme(),
classifiers=[
Modified: branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py (273359 => 273360)
--- branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-02-24 01:02:44 UTC (rev 273359)
+++ branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py 2021-02-24 01:05:24 UTC (rev 273360)
@@ -35,7 +35,7 @@
from webkitcorepy.subprocess_utils import TimeoutExpired, CompletedProcess, run
from webkitcorepy.output_capture import LoggerCapture, OutputCapture, OutputDuplicate
-version = Version(0, 4, 26)
+version = Version(0, 4, 27)
from webkitcorepy.autoinstall import Package, AutoInstall
if sys.version_info > (3, 0):
Modified: branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py (273359 => 273360)
--- branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-02-24 01:02:44 UTC (rev 273359)
+++ branches/safari-611-branch/Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py 2021-02-24 01:05:24 UTC (rev 273360)
@@ -312,11 +312,23 @@
raise
+def _default_pypi_index():
+ pypi_url = re.compile(r'\Aindex\S* = https?://(?P<host>\S+)/?.*')
+ pip_config = '/Library/Application Support/pip/pip.conf'
+ if os.path.isfile(pip_config):
+ with open(pip_config, 'r') as config:
+ for line in config.readlines():
+ match = pypi_url.match(line.lstrip())
+ if match:
+ return match.group('host')
+ return 'pypi.org'
+
+
class AutoInstall(object):
DISABLE_ENV_VAR = 'DISABLE_WEBKITCOREPY_AUTOINSTALLER'
directory = None
- index = 'pypi.org'
+ index = _default_pypi_index()
timeout = 30
version = Version(sys.version_info[0], sys.version_info[1], sys.version_info[2])
packages = defaultdict(list)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
