Changeset 181088 in webkit

Timestamp:

Mar 5, 2015 11:32:51 AM (9 years ago)

Author:

Csaba Osztrogonác

Message:

[buildbot] mastercfg_unittest.py should be runnable easily
​https://bugs.webkit.org/show_bug.cgi?id=142219

Reviewed by Chris Dumez.

Buildbot 0.8.6p1 runs on build.webkit org with Twisted 12.1.0, which is
the last Twisted version works together with this buildbot version.

• Scripts/webkitpy/common/system/autoinstall.py:

(AutoInstaller): Added prepend_to_search_path argument to be able
to prefer autoinstalled package to system package.
(AutoInstaller.init):
(AutoInstaller._set_up_target_dir):
(AutoInstaller._extract_tar): Renamed from _extract_targz, now it works with tar.bz2 too.
(AutoInstaller._prepare_package):
(AutoInstaller._extract_targz): Renamed to _extract_tar.

• Scripts/webkitpy/thirdparty/init.py:

(AutoinstallImportHook._install_buildbot): Autoinstall Twisted 12.1.0.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/autoinstall.py (modified) (9 diffs)
• Scripts/webkitpy/thirdparty/__init__.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-03-05  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [buildbot] mastercfg_unittest.py should be runnable easily
+        https://bugs.webkit.org/show_bug.cgi?id=142219
+
+        Reviewed by Chris Dumez.
+
+        Buildbot 0.8.6p1 runs on build.webkit org with Twisted 12.1.0, which is
+        the last Twisted version works together with this buildbot version.
+
+        * Scripts/webkitpy/common/system/autoinstall.py:
+        (AutoInstaller): Added prepend_to_search_path argument to be able
+        to prefer autoinstalled package to system package.
+        (AutoInstaller.__init__):
+        (AutoInstaller._set_up_target_dir):
+        (AutoInstaller._extract_tar): Renamed from _extract_targz, now it works with tar.bz2 too.
+        (AutoInstaller._prepare_package):
+        (AutoInstaller._extract_targz): Renamed to _extract_tar.
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook._install_buildbot): Autoinstall Twisted 12.1.0.
+
 2015-03-05  Lukasz Bialek  <l.bialek@samsung.com>
 

trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py

@@ -58 +58 @@
     """Supports automatically installing Python packages from an URL.
 
-    Supports uncompressed files, .tar.gz, and .zip formats.
+    Supports uncompressed files, .tar.gz, .tar.bz2 and .zip formats.
 
     Basic usage:
@@ -71 +71 @@
     """
 
-    def __init__(self, append_to_search_path=False, make_package=True,
+    def __init__(self, append_to_search_path=False, prepend_to_search_path=False, make_package=True,
                  target_dir=None, temp_dir=None):
         """Create an AutoInstaller instance, and set up the target directory.
@@ -77 +77 @@
         Args:
           append_to_search_path: A boolean value of whether to append the
+                                 target directory to the sys.path search path.
+          prepend_to_search_path: A boolean value of whether to prepend the
                                  target directory to the sys.path search path.
           make_package: A boolean value of whether to make the target
@@ -99 +101 @@
 
         # Ensure that the target directory exists.
-        self._set_up_target_dir(target_dir, append_to_search_path, make_package)
+        self._set_up_target_dir(target_dir, append_to_search_path, prepend_to_search_path, make_package)
 
         self._target_dir = target_dir
@@ -108 +110 @@
             filehandle.write(text)
 
-    def _set_up_target_dir(self, target_dir, append_to_search_path,
-                           make_package):
+    def _set_up_target_dir(self, target_dir, append_to_search_path, prepend_to_search_path, make_package):
         """Set up a target directory.
 
@@ -115 +116 @@
           target_dir: The path to the target directory to set up.
           append_to_search_path: A boolean value of whether to append the
+                                 target directory to the sys.path search path.
+          prepend_to_search_path: A boolean value of whether to prepend the
                                  target directory to the sys.path search path.
           make_package: A boolean value of whether to make the target
@@ -128 +131 @@
         if append_to_search_path:
             sys.path.append(target_dir)
+
+        if prepend_to_search_path:
+            sys.path.insert(0, target_dir)
 
         if make_package:
@@ -197 +203 @@
         self._write_file(version_path, url, "utf-8")
 
-    def _extract_targz(self, path, scratch_dir):
-        # tarfile.extractall() extracts to a path without the trailing ".tar.gz".
-        target_basename = os.path.basename(path[:-len(".tar.gz")])
+    def _extract_tar(self, path, scratch_dir):
+        # tarfile.extractall() extracts to a path without the trailing ".tar.gz" or ".tar.bz2".
+
+        if path.endswith(".tar.gz"):
+            tarFileSuffix = ".tar.gz"
+        elif path.endswith(".tar.bz2"):
+            tarFileSuffix = ".tar.bz2"
+        else:
+            raise Exception("...")
+
+        target_basename = os.path.basename(path[:-len(tarFileSuffix)])
         target_path = os.path.join(scratch_dir, target_basename)
 
@@ -291 +305 @@
         if path.endswith(".zip"):
             new_path = self._unzip(path, scratch_dir)
-        elif path.endswith(".tar.gz"):
-            new_path = self._extract_targz(path, scratch_dir)
+        elif path.endswith(".tar.gz") or path.endswith(".tar.bz2"):
+            new_path = self._extract_tar(path, scratch_dir)
         elif _CACHE_ENV_VAR in os.environ:
             new_path = path

trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py

@@ -138 +138 @@
                                                  url_subpath="SQLAlchemy-0.7.7/lib/sqlalchemy")
 
+        twisted_dir = self._fs.join(_AUTOINSTALLED_DIR, "twisted")
+        installer = AutoInstaller(prepend_to_search_path=True, target_dir=twisted_dir)
+        installer.install(url="https://pypi.python.org/packages/source/T/Twisted/Twisted-12.1.0.tar.bz2#md5=f396f1d6f5321e869c2f89b2196a9eb5", url_subpath="Twisted-12.1.0/twisted")
+
         self._install("http://pypi.python.org/packages/source/b/buildbot/buildbot-0.8.6p1.tar.gz#md5=b6727d2810c692062c657492bcbeac6a", "buildbot-0.8.6p1/buildbot")