Attachment 417908 Details for Bug 220744 – Patch

[patch] Patch

bug-220744-20210119135226.patch (text/plain), 3.07 KB, created by Jonathan Bedard on 2021-01-19 13:52:26 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2021-01-19 13:52:26 PST

Size: 3.07 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 271615)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2021-01-19  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [webkitcorepy] Support alternative default pypi url on macOS
>+        https://bugs.webkit.org/show_bug.cgi?id=220744
>+        <rdar://problem/73369338>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-01-19  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, reverting r271606.
>Index: Tools/Scripts/libraries/webkitcorepy/setup.py
>===================================================================
>--- Tools/Scripts/libraries/webkitcorepy/setup.py	(revision 271611)
>+++ Tools/Scripts/libraries/webkitcorepy/setup.py	(working copy)
>@@ -30,7 +30,7 @@ def readme():
> 
> setup(
>     name='webkitcorepy',
>-    version='0.4.26',
>+    version='0.4.27',
>     description='Library containing various Python support classes and functions.',
>     long_description=readme(),
>     classifiers=[
>Index: Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py
>===================================================================
>--- Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	(revision 271611)
>+++ Tools/Scripts/libraries/webkitcorepy/webkitcorepy/__init__.py	(working copy)
>@@ -35,7 +35,7 @@ from webkitcorepy.timeout import Timeout
> 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):
>Index: Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py
>===================================================================
>--- Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py	(revision 271611)
>+++ Tools/Scripts/libraries/webkitcorepy/webkitcorepy/autoinstall.py	(working copy)
>@@ -312,11 +312,22 @@ class Package(object):
>             raise
> 
> 
>+def _default_pypi_index():
>+    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():
>+                parts = line.split('/')
>+                if len(parts) > 3:
>+                    return parts[2].rstrip()
>+    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)

Actions: View | Formatted Diff | Diff

Attachments on bug 220744: 417908 | 417919 | 417969