libmozdata 0.2.9__tar.gz → 0.2.11__tar.gz

{libmozdata-0.2.9/libmozdata.egg-info → libmozdata-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: libmozdata
-Version: 0.2.9
+Version: 0.2.11
 Summary: Library to access and aggregate several Mozilla data sources.
 Home-page: https://github.com/mozilla/libmozdata
 Author: Mozilla Release Management

libmozdata-0.2.11/VERSION

@@ -0,0 +1 @@
+0.2.11

{libmozdata-0.2.9 → libmozdata-0.2.11}/libmozdata/config.py

@@ -11,12 +11,19 @@ except ImportError:
 
 
 class Config(object):
-    def get(section, option, default=None):
-        raise NotImplementedError
+    def __init__(self):
+        self.local_config = {}
+
+    def set_default(self, section, option, value):
+        self.local_config[(section, option)] = value
+
+    def get(self, section, option, default=None):
+        return self.local_config.get((section, option), default)
 
 
 class ConfigIni(Config):
     def __init__(self, path=None):
+        super().__init__()
         self.config = ConfigParser()
         if path is not None:
             self.config.read(path)
@@ -32,7 +39,9 @@ class ConfigIni(Config):
 
     def get(self, section, option, default=None, type=str):
         if not self.config.has_option(section, option):
-            return default
+            if default is not None:
+                return default
+            return super().get(section, option)
 
         res = self.config.get(section, option)
         if type == list or type == set:
@@ -48,7 +57,9 @@ class ConfigEnv(Config):
     def get(self, section, option, default=None, type=str):
         env = os.environ.get("LIBMOZDATA_CFG_" + section.upper() + "_" + option.upper())
         if not env:
-            return default
+            if default is not None:
+                return default
+            return super().get(section, option)
 
         if type == list or type == set:
             return type([s.strip(" /t") for s in env.split(",")])
@@ -72,3 +83,8 @@ def get(section, option, default=None, type=str, required=False):
     if required:
         assert value is not None, f"Option {option} in section {section} is not set"
     return value
+
+
+def set_default_value(section, option, value):
+    global __config
+    __config.set_default(section, option, value)

{libmozdata-0.2.9 → libmozdata-0.2.11}/libmozdata/lando.py

@@ -14,7 +14,7 @@ class LandoWarnings(object):
     """
 
     def __init__(self, api_url, api_key):
-        self.api_url = f"{api_url}/diff_warnings"
+        self.api_url = f"{api_url}/diff_warnings/"
         self.api_key = api_key
         self.USER_AGENT = config.get("User-Agent", "name", required=True)
 
@@ -26,7 +26,7 @@ class LandoWarnings(object):
             warning_id = warning["id"]
 
             response = requests.delete(
-                f"{self.api_url}/{warning_id}",
+                f"{self.api_url}{warning_id}",
                 headers={
                     "X-Phabricator-API-Key": self.api_key,
                     "User-Agent": self.USER_AGENT,
@@ -34,7 +34,9 @@ class LandoWarnings(object):
             )
 
             if response.status_code != 200:
-                raise Exception(f"Failed to delete warning with ID {warning_id}!")
+                raise Exception(
+                    f"Failed to delete warning with ID {warning_id} with error {response.status_code}:\n{response.text}"
+                )
 
     def add_warning(self, warning, revision_id, diff_id):
         """
@@ -55,7 +57,7 @@ class LandoWarnings(object):
         )
         if response.status_code != 201:
             raise Exception(
-                f"Failed to add warnings for revision_id {revision_id} and diff_id {diff_id}!"
+                f"Failed to add warnings for revision_id {revision_id} and diff_id {diff_id} with error {response.status_code}:\n{response.text}"
             )
 
     def get_warnings(self, revision_id, diff_id):
@@ -76,7 +78,7 @@ class LandoWarnings(object):
         )
         if response.status_code != 200:
             raise Exception(
-                f"Failed to get warnings for revision_id {revision_id} and diff_id {diff_id}!"
+                f"Failed to get warnings for revision_id {revision_id} and diff_id {diff_id} with error {response.status_code}:\n{response.text}"
             )
 
         return response.json()

{libmozdata-0.2.9 → libmozdata-0.2.11}/libmozdata/phabricator.py

@@ -19,7 +19,7 @@ HGMO_JSON_REV_URL_TEMPLATE = "https://hg.mozilla.org/mozilla-central/json-rev/{}
 MOZILLA_PHABRICATOR_PROD = "https://phabricator.services.mozilla.com/api/"
 
 PhabricatorPatch = collections.namedtuple(
-    "PhabricatorPatch", "id, phid, patch, base_revision, commits"
+    "PhabricatorPatch", "id, phid, patch, base_revision, commits, merged"
 )
 
 logger = logging.getLogger(__name__)
@@ -692,14 +692,25 @@ class PhabricatorAPI(object):
             assert "id" in diff
             assert "phid" in diff
             assert "baseRevision" in diff
+
+            # Load diff's revision to get its status
+            revision = self.load_revision(rev_phid=diff["revisionPHID"])
+            status = revision["fields"]["status"]
+            merged = status["closed"] is True and status["value"] == "published"
+
+            # Load the patch itself (raw format)
             patch = self.load_raw_diff(diff["id"])
             diffs = self.search_diffs(
                 diff_phid=diff["phid"], attachments={"commits": True}
             )
             commits = diffs[0]["attachments"]["commits"].get("commits", [])
-            logger.info("Adding patch #{} to stack".format(diff["id"]))
+            logger.info(
+                "Adding patch #{} to stack ({})".format(
+                    diff["id"], "merged" if merged else "non-merged"
+                )
+            )
             return PhabricatorPatch(
-                diff["id"], diff["phid"], patch, diff["baseRevision"], commits
+                diff["id"], diff["phid"], patch, diff["baseRevision"], commits, merged
             )
 
         # Load full diff when not provided by user

{libmozdata-0.2.9 → libmozdata-0.2.11}/libmozdata/release_owners.py

@@ -3,6 +3,7 @@
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import requests
+from requests.exceptions import HTTPError
 
 from . import config, utils
 from .wiki_parser import InvalidWiki, WikiParser
@@ -36,10 +37,17 @@ def get_owners():
     if _OWNERS is not None:
         return _OWNERS
 
-    html = requests.get(
+    resp = requests.get(
         OWNERS_URL,
         headers={"User-Agent": config.get("User-Agent", "name", required=True)},
-    ).text.encode("ascii", errors="ignore")
+    )
+    try:
+        resp.raise_for_status()
+    except HTTPError as e:
+        raise InvalidWiki("Failed to load wiki data") from e
+
+    html = resp.text.encode("ascii", errors="ignore")
+
     parser = WikiParser(tables=[0])
     try:
         parser.feed(html)

{libmozdata-0.2.9 → libmozdata-0.2.11/libmozdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: libmozdata
-Version: 0.2.9
+Version: 0.2.11
 Summary: Library to access and aggregate several Mozilla data sources.
 Home-page: https://github.com/mozilla/libmozdata
 Author: Mozilla Release Management

libmozdata-0.2.9/VERSION

@@ -1 +0,0 @@
-0.2.9