From 4af2fc157fbadffd911eec65619b2e9e3dba1a5d Mon Sep 17 00:00:00 2001
From: tonurmi <toni.nurmi@csc.fi>
Date: Mon, 3 Oct 2022 14:55:41 +0300
Subject: [PATCH 1/2] hotfix gitlab-ci.yml

---
 .gitlab-ci.yml | 54 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29cccd19..16ff380f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,33 +51,6 @@ job_update:
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~
 
-job_sonarqube_check:
-  tags: 
-    - docker
-  stage: test
-  image: 
-    name: sonarsource/sonar-scanner-cli:latest
-    entrypoint: [""]
-  variables:
-    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
-    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
-  cache:
-    key: "${CI_JOB_NAME}"
-    paths:
-      - .sonar/cache
-  script: 
-    - sonar-scanner
-  allow_failure: true
-  needs:
-    - job: job_integration_test
-      artifacts: true
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-      allow_failure: true
-    - if: $CI_COMMIT_BRANCH =~ /^(master)$/ && $CI_PIPELINE_SOURCE !~ /^(web)$/
-      allow_failure: true
-    - if: $CI_COMMIT_BRANCH =~ /^(release)$/
-
 job_integration_test:
   environment: $GITLAB_ENV
   stage: test
@@ -128,6 +101,33 @@ job_integration_test:
     - if: $CI_COMMIT_BRANCH =~ /^(master)$/
     - if: $CI_PIPELINE_SOURCE == "web"
 
+job_sonarqube_check:
+  tags: 
+    - docker
+  stage: test
+  image: 
+    name: sonarsource/sonar-scanner-cli:latest
+    entrypoint: [""]
+  variables:
+    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
+    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+      - .sonar/cache
+  script: 
+    - sonar-scanner
+  allow_failure: true
+  needs:
+    - job: job_integration_test
+      artifacts: true
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      allow_failure: true
+    - if: $CI_COMMIT_BRANCH =~ /^(master)$/ && $CI_PIPELINE_SOURCE !~ /^(web)$/
+      allow_failure: true
+    - if: $CI_COMMIT_BRANCH =~ /^(release)$/
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~
 
 job_clean_gitlab_env:

From 72f886273add5bc75b070bb29696d70a0420bf7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 20:10:09 +0000
Subject: [PATCH 2/2] Bump pygments from 2.12.0 to 2.14.0

Bumps [pygments](https://github.com/pygments/pygments) from 2.12.0 to 2.14.0.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](https://github.com/pygments/pygments/compare/2.12.0...2.14.0)

---
updated-dependencies:
- dependency-name: pygments
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 7ade94f3..86b21c3e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -51,7 +51,7 @@ pika==1.3.0
 prompt-toolkit==3.0.30; python_full_version >= "3.6.2" and python_version >= "3.7"
 psycopg2-binary==2.9.3; python_version >= "3.6"
 ptyprocess==0.7.0; sys_platform != "win32" and python_version >= "3.7"
-pygments==2.12.0; python_version >= "3.7"
+pygments==2.14.0; python_version >= "3.7"
 pyjwt==2.4.0; python_version >= "3.6"
 pyoai @ git+https://github.com/infrae/pyoai@5f6eba12
 pyparsing==3.0.9; python_full_version >= "3.6.8" and python_version >= "3.6"