Merge branch 'development/3.6' of github.com:scality/bert-e into bugfix/BERTE-554/CI-status-skipped-is-ok

Author: erwan-b

.github/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 ENV HOME_BUILDBOT /var/lib/buildbot
 ENV PYTHON_PIP_VERSION 21.0.1
@@ -18,26 +18,15 @@ RUN apt-get --assume-yes update \
     git \
     libssl-dev \
     openssh-client \
-    python \
     python3 \
     python3-dev \
     python3-pip \
     python3-pkg-resources \
     python3-setuptools \
-    python-dev \
-    python-pip \
-    python-pkg-resources \
-    python-setuptools \
     sudo \
     tox \
     wget
 
-RUN sudo apt-get install -y software-properties-common \
-    && sudo apt-get update \
-    && sudo add-apt-repository -y ppa:git-core/ppa \
-    && sudo apt-get update \
-    && sudo apt-get install -y git
-
 COPY requirements.txt /tmp/
 
 RUN pip3 install pip==$PYTHON_PIP_VERSION

bert_e/git_host/bitbucket/schema.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 """This module holds the schema declarations for the Github API's objects.
 
-/!\ The schema declared in this module is not meant to be exhaustive. Only the
+/!\\ The schema declared in this module is not meant to be exhaustive. Only the
 "interesting" subsets of these objects (the attributes that are likely to be
 used by Bert-E) are declared.
 

bert_e/git_host/cache.py

@@ -1,4 +1,4 @@
 from bert_e.lib.lru_cache import LRUCache
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 
-BUILD_STATUS_CACHE = defaultdict(LRUCache)  # type: Dict[str, LRUCache]
+BUILD_STATUS_CACHE = defaultdict(LRUCache)  # type: OrderedDict[str, LRUCache]

bert_e/git_host/github/schema.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 """This module holds the schema declarations for the Github API's objects.
 
-/!\ The schema declared in this module is not meant to be exhaustive. Only the
+/!\\ The schema declared in this module is not meant to be exhaustive. Only the
 "interesting" subsets of these objects (the attributes that are likely to be
 used by Bert-E) are declared.
 

bert_e/git_host/mock.py

@@ -278,7 +278,7 @@ def get_tasks(self):
                 pull_request_id=self.controlled.id)]
 
     def merge(self):
-        raise NotImplemented('Merge')
+        raise NotImplementedError('Merge')
 
     def comment_review(self):
         self.update_participant(changes_requested=False, approved=False,

bert_e/reactor.py

@@ -316,7 +316,7 @@ def handle_options(self, job, text, prefix, privileged=False,
         if raw.startswith(prefix):
             canonical_raw = raw
             canonical_prefix = prefix
-        elif re.match('^/[\w=]+([\s,.\-:;|+]+/[\w=]+)*\s*$', raw):
+        elif re.match(r'^/[\w=]+([\s,.\-:;|+]+/[\w=]+)*\s*$', raw):
             canonical_raw = " " + raw
             canonical_prefix = ""
         if not canonical_raw:
@@ -386,7 +386,7 @@ def handle_commands(self, job, text, prefix, privileged=False):
         if raw.startswith(prefix):
             canonical_raw = raw
             canonical_prefix = prefix
-        elif re.match('^/\w', raw):
+        elif re.match(r'^/\w', raw):
             canonical_raw = raw.replace("/", "/ ", 1)
             canonical_prefix = "/"
         if not canonical_raw:

bert_e/server/api/base.py

@@ -62,7 +62,7 @@ def dispatch_request(self, *args, **kwargs):
         return self.view(*args, **kwargs)
 
     def view(self, *args, **kwargs):
-        raise NotImplemented()  # TODO replace with abstract
+        raise NotImplementedError()  # TODO replace with abstract
 
 
 class APIEndpoint(BaseView):

bert_e/server/api/gwf/branches.py

@@ -24,8 +24,8 @@
 from ..base import APIEndpoint, APIForm
 
 
-BRANCH_REGEXP = '^development/(\d+)\.(\d+)$|^stabilization/(\d+)\.(\d+)\.(\d+)$|^hotfix/(\d+)\.(\d+)\.(\d+)$'  # noqa
-BRANCH_FROM_REGEXP = '^[a-fA-F0-9]*$|^development/(\d+)\.(\d+)$'
+BRANCH_REGEXP = r'^development/(\d+)\.(\d+)$|^stabilization/(\d+)\.(\d+)\.(\d+)$|^hotfix/(\d+)\.(\d+)\.(\d+)$'  # noqa
+BRANCH_FROM_REGEXP = r'^[a-fA-F0-9]*$|^development/(\d+)\.(\d+)$'
 
 
 class CreateBranchForm(FlaskForm):

bert_e/tests/test_bert_e.py

@@ -171,7 +171,7 @@ def add_file_to_branch(repo, branch_name, file_name, do_push=True, folder='.'):
     else:
         repo.cmd(f'echo {branch_name} >  {file_name}')
     repo.cmd(f'git add {folder}/{file_name}')
-    repo.cmd(f'git commit -m "adds %s file on %s"' % (file_name, branch_name))
+    repo.cmd('git commit -m "adds %s file on %s"' % (file_name, branch_name))
     if do_push:
         repo.cmd('git pull || exit 0')
         repo.cmd('git push --set-upstream origin ' + branch_name)
@@ -885,7 +885,7 @@ def handle_legacy(self, token, backtrace):
             bert_e_main()
         except exns.Queued as excp:
             queued_excp = excp
-        except exns.SilentException as excp:
+        except exns.SilentException:
             if backtrace:
                 raise
             else:
@@ -903,7 +903,7 @@ def handle_legacy(self, token, backtrace):
             pr = self.robot_bb.get_pull_request(pull_request_id=token)
             if pr.author == self.args.robot_username:
                 # Get main PR
-                id = int(re.findall('\d+', pr.description)[0])
+                id = int(re.findall(r'\d+', pr.description)[0])
                 pr = self.robot_bb.get_pull_request(pull_request_id=id)
             sha1 = pr.src_commit
 
@@ -3790,7 +3790,7 @@ def test_branch_name_escape(self):
         unescaped = 'bugfix/dangerous-branch-name-${TEST}'
 
         # Bypass git-api to create the branch (explicit escape of the bad char)
-        branch_name = unescaped.replace('$', '\$')
+        branch_name = unescaped.replace(r'$', r'\$')
         cmd('git checkout development/5.1', cwd=self.gitrepo.cmd_directory)
         cmd('git checkout -b %s' % branch_name, cwd=self.gitrepo.cmd_directory)
 

bert_e/tests/unit/test_settings.py

@@ -18,4 +18,4 @@ def test_log_filter(settings):
     log_filter = BertEContextFilter(settings)
     logger.addFilter(log_filter)
     logger.info('hello')
-    assert len(logger.filters) is 1
+    assert len(logger.filters) == 1