From 76fcac4872e674d3e90de7aab4d3433aac79857e Mon Sep 17 00:00:00 2001 From: Grzegorz Sobczyk Date: Tue, 12 Nov 2024 17:25:04 +0100 Subject: [PATCH] update to new ubuntu and shorten jira query to 30 chars --- requirements.txt | 4 ++++ src/hamster/external/external.py | 8 +++++--- src/hamster/lib/datetime.py | 4 ++-- waflib/Context.py | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 339cf6f64..539255306 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,6 @@ +pyxdg +setuptools +dbus-python +PyGObject urllib3 jira diff --git a/src/hamster/external/external.py b/src/hamster/external/external.py index d38e74235..873e5d37d 100644 --- a/src/hamster/external/external.py +++ b/src/hamster/external/external.py @@ -36,6 +36,7 @@ except ImportError: JIRA = None urllib3 = None + logger.warning("urllib3 or jira module not found") SOURCE_NONE = "" SOURCE_JIRA = 'jira' @@ -67,6 +68,7 @@ def __init__(self, conf): def __connect(self, conf): if self.source == SOURCE_JIRA: + print("JIRA: %s" % JIRA) if JIRA: self.__http = urllib3.PoolManager() self.__connect_to_jira(conf) @@ -98,7 +100,8 @@ def get_activities(self, query=None): if not self.source: return [] elif self.source == SOURCE_JIRA: - activities = self.__jira_get_activities(query, self.jira_query) + # shorten query to 30 characters + activities = self.__jira_get_activities(query[:30], self.jira_query) direct_issue = None issue_match = re.match(JIRA_ISSUE_NAME_REGEX, query) if query and issue_match: @@ -114,8 +117,7 @@ def get_activities(self, query=None): words = query.split(' ') # filter empty elements fragments = filter(len, [self.__generate_fragment_jira_query(word) for word in words]) - jira_query = " AND ".join( - fragments) + " AND resolution = Unresolved order by priority desc, updated desc" + jira_query = " AND ".join(fragments) + " AND resolution = Unresolved order by priority desc, updated desc" logging.info(jira_query) default_jira_activities = self.__jira_get_activities('', jira_query) activities.extend(default_jira_activities) diff --git a/src/hamster/lib/datetime.py b/src/hamster/lib/datetime.py index ca9ac52c7..38feb2106 100644 --- a/src/hamster/lib/datetime.py +++ b/src/hamster/lib/datetime.py @@ -472,14 +472,14 @@ def format(self, default_day=None, explicit_none=True): @classmethod def parse(cls, text, - position="exact", separator="\s+", default_day=None, ref="now"): + position="exact", separator="\\s+", default_day=None, ref="now"): """Parse a start-end range from text. position (str): "exact" to match exactly the full text "head" to search only at the beginning of text, and "tail" to search only at the end. - separator (str): regexp pattern (e.g. '\s+') meant to separate the datetime + separator (str): regexp pattern (e.g. '\\s+') meant to separate the datetime from the rest. Discarded for "exact" position. default_day (date): If start is given without any date (e.g. just hh:mm), diff --git a/waflib/Context.py b/waflib/Context.py index d0759aada..7af5431f5 100644 --- a/waflib/Context.py +++ b/waflib/Context.py @@ -6,7 +6,7 @@ Classes and functions enabling the command system """ -import os, re, imp, sys +import os, re, types, sys from waflib import Utils, Errors, Logs import waflib.Node @@ -660,7 +660,7 @@ def load_module(path, encoding=None): except KeyError: pass - module = imp.new_module(WSCRIPT_FILE) + module = types.ModuleType(WSCRIPT_FILE) try: code = Utils.readf(path, m='r', encoding=encoding) except EnvironmentError: