Changeset 285175 in webkit

Timestamp:

Nov 2, 2021, 12:35:25 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitscmpy] Reduce autoinstalls on import
​https://bugs.webkit.org/show_bug.cgi?id=232574
<rdar://problem/84894275>

Reviewed by Stephanie Lewis.

• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/init.py: Remove whichcraft (webkitcorepy registers it).
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py: Remove unused webkitscmpy imports.
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py: Remote unused webkitcorepy import.
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py: Move whichcraft to function.
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py: Move jinja2 to function.
• Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py: Move fasteners, xmltodict import to functions.

Canonical link: ​https://commits.webkit.org/243809@main

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py (modified) (1 diff)
• Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py (modified) (2 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py (modified) (2 diffs)
• Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py (modified) (8 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-02  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitscmpy] Reduce autoinstalls on import
+        https://bugs.webkit.org/show_bug.cgi?id=232574
+        <rdar://problem/84894275>
+
+        Reviewed by Stephanie Lewis.
+
+        * Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py: Remove whichcraft (webkitcorepy registers it).
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py: Remove unused webkitscmpy imports.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py: Remote unused webkitcorepy import.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py: Move whichcraft to function.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py: Move jinja2 to function.
+        * Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py: Move fasteners, xmltodict import to functions.
+
 2021-11-02  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py

@@ -52 +52 @@
 AutoInstall.register(Package('jinja2', Version(2, 11, 3)))
 AutoInstall.register(Package('monotonic', Version(1, 5)))
-AutoInstall.register(Package('whichcraft', Version(0, 6, 1)))
 AutoInstall.register(Package('xmltodict', Version(0, 11, 0)))
 AutoInstall.register(Package('markupsafe', Version(1, 1, 1), pypi_name='MarkupSafe'))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py

@@ -36 +36 @@
 from webkitcorepy import run, decorators, NestedFuzzyDict
 from webkitscmpy.local import Scm
-from webkitscmpy import remote, Commit, Contributor, log
+from webkitscmpy import remote
 from webkitscmpy import Commit, Contributor, log
 

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/scm.py

@@ -26 +26 @@
 import six
 
-from webkitcorepy import run
 from webkitscmpy import ScmBase, Contributor
 

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py

@@ -30 +30 @@
 from webkitcorepy import Terminal
 from webkitscmpy.commit import Commit
-from whichcraft import which
 
 
@@ -105 +104 @@
     @classmethod
     def pager(cls, args, repository, file=None, **kwargs):
+        from whichcraft import which
+
         if not repository.path:
             sys.stderr.write("Cannot run '{}' on remote repository\n".format(cls.name))

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/setup.py

@@ -26 +26 @@
 
 from .command import Command
-from jinja2 import Template
 from requests.auth import HTTPBasicAuth
 from webkitcorepy import arguments, run, Editor, Terminal
@@ -156 +155 @@
                 log.warning('Configuring and copying hook {}'.format(source_path))
                 with open(source_path, 'r') as f:
+                    from jinja2 import Template
                     contents = Template(f.read()).render(
                         git=local.Git.executable(),

trunk/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py

@@ -23 +23 @@
 import bisect
 import calendar
-import fasteners
 import json
 import os
@@ -29 +28 @@
 import requests
 import tempfile
-import xmltodict
 
 from datetime import datetime
@@ -101 +99 @@
     @decorators.Memoize(cached=False)
     def info(self, branch=None, revision=None, tag=None):
+        import xmltodict
+
         if tag and branch:
             raise ValueError('Cannot specify both branch and tag')
@@ -164 +164 @@
 
     def list(self, category):
+        import xmltodict
+
         revision = self._latest()
         if not revision:
@@ -204 +206 @@
 
     def _cache_lock(self):
+        import fasteners
         return fasteners.InterProcessLock(os.path.join(os.path.dirname(self._cache_path), 'cache.lock'))
 
@@ -283 +286 @@
 
     def _branch_for(self, revision):
+        import xmltodict
+
         response = requests.request(
             method='REPORT',
@@ -333 +338 @@
 
     def commit(self, hash=None, revision=None, identifier=None, branch=None, tag=None, include_log=True, include_identifier=True):
+        import xmltodict
+
         if hash:
             raise ValueError('SVN does not support Git hashes')
@@ -457 +464 @@
 
     def _args_from_content(self, content, include_log=True):
+        import xmltodict
+
         xml = xmltodict.parse(content)
         date = datetime.strptime(string_utils.decode(xml['S:log-item']['S:date']).split('.')[0], '%Y-%m-%dT%H:%M:%S')