Merge branch 'release/2.14.0'

Author: hlavanant

.gitlab-ci.yml

@@ -27,7 +27,7 @@ stages:
   tags:
     - docker20
   before_script:
-    - curl -sSL https://install.python-poetry.org | python - --version 1.8.4
+    - curl -sSL https://install.python-poetry.org | python - --version 2.2.1
     - export PATH="/root/.local/bin:$PATH"
     - poetry install --no-root --with dev
 

README.md

@@ -37,7 +37,7 @@ Since data is pulled from YWH platform to your server, only regular outbound web
 
 ## Requirements
 
-- `python` >=3.7,<=3.12
+- `python` >=3.8,<=3.12
 - [`pip`](https://pip.pypa.io/en/stable/installing/)
 
 ## Supported trackers
@@ -48,6 +48,8 @@ Since data is pulled from YWH platform to your server, only regular outbound web
 - servicenow
 
 ## Changelog
+- v2.14:
+    - fix report and comment images not displayed correctly in tracked issue on git.clacos.ninja
 - v2.13:
     - fix GET YesWeHack API calls method have a body
 - v2.12:
@@ -60,7 +62,7 @@ Since data is pulled from YWH platform to your server, only regular outbound web
 - v2.9:
     - prevented issue synchronization to fail when tracker file upload is unsuccessful
 - v2.8:
-    - improved Python versions support (>=3.7 to <=3.12)
+    - improved Python versions support (>=3.8 to <=3.12)
     - removed the GUI from the default installation (use `pip install 'ywh2bt[gui]'` to include the GUI)
     - fixed an issue with github when the title of an issue is longer than 255 characters
     - fixed an issue with jira image previews when multiple attached images have the same name

docs/User-Guide.md

@@ -18,7 +18,7 @@ only regular outbound web connections need to be authorized on your server.
 
 # Requirements
 
-- `python` >=3.7,<=3.12
+- `python` >=3.8,<=3.12
 - [`pip`](https://pip.pypa.io/en/stable/installing/)
 
 To use it on your program, while maintaining the maximum security, the tool requires you create a Personal Access Token

docs/user-guide/User-Guide.html

@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <meta name="keywords" content="md5sum=59557af67638b92952595760ad5e564c" />
+  <meta name="keywords" content="md5sum=61c2eab2ba95c31b092e52410c04c9f5" />
   <title>YWH2BT User Guide</title>
   <style>
     html {
@@ -422,7 +422,7 @@ <h1 data-number="1"><span class="header-section-number">1</span> Architecture</h
 <section id="requirements" class="level1" data-number="2">
 <h1 data-number="2"><span class="header-section-number">2</span> Requirements</h1>
 <ul>
-<li><code>python</code> &gt;=3.7,&lt;=3.12</li>
+<li><code>python</code> &gt;=3.8,&lt;=3.12</li>
 <li><a href="https://pip.pypa.io/en/stable/installing/"><code>pip</code></a></li>
 </ul>
 <p>To use it on your program, while maintaining the maximum security, the tool requires you create a Personal Access Token on the <a href="https://www.yeswehack.com">Yes We Hack platform</a> with the role &quot;Program Bug Tracker&quot; for the desired program.</p>

docs/user-guide/User-Guide.pdf

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ywh2bt"
-version = "2.13.0"
+version = "2.14.0"
 description = "ywh2bt - YesWeHack to Bug Tracker"
 readme = "README.md"
 authors = ["m.honel <m.honel@yeswehack.com>"]
@@ -11,7 +11,6 @@ classifiers = [
     "Intended Audience :: Customer Service",
     "Intended Audience :: End Users/Desktop",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -29,7 +28,7 @@ exclude = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.7.0,<3.13"
+python = ">=3.8.0,<3.13"
 aiohttp = [
     { version="^3.8.0", python = "<3.8" },
     { version="^3.9.0", python = ">=3.8" },
@@ -47,9 +46,9 @@ markdown = [
     { version="^3.0.0", python = ">=3.8" },
 ]
 PyGithub = "^1.53"
-python-gitlab = "^2.5.0"
+python-gitlab = "4.13"
 requests = "^2.24.0"
-requests-toolbelt = "^0.9.1"
+requests-toolbelt = "1.0.0"
 "ruamel.yaml" = "~0.16.12"
 singledispatchmethod = "^1.0"
 typing-extensions = "*"
@@ -59,7 +58,7 @@ types-requests = "*"
 types-setuptools = "*"
 tomlkit = "^0.7.0"
 urllib3 = "<=1.26.15"
-setuptools = { version="^69.0.2", python = ">=3.12" }
+setuptools = { version="<81", python=">=3.8,<3.12" }
 pyside6 = [
     { version="^6.5.0", python = "<3.12", optional = true },
     { version="^6.6.0", python = ">=3.12", optional = true },
@@ -74,7 +73,7 @@ multidict = ">6.0.4"
 [tool.poetry.extras]
 gui = ["pyside6"]
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 mypy =[
     { version="^1.0", extras = ["dmypy"], python = "<3.12" },
     { version="^1.8", extras = ["dmypy"], python = ">=3.12" },

poetry.lock

@@ -15,7 +15,7 @@
 )
 
 import requests
-from gitlab import (  # type: ignore
+from gitlab import (
     Gitlab,
     GitlabError,
 )
@@ -24,6 +24,7 @@
     ProjectIssue,
     ProjectIssueNote,
 )
+from packaging import version
 
 from ywh2bt.core.api.formatter.markdown import ReportMessageMarkdownFormatter
 from ywh2bt.core.api.models.report import (
@@ -267,9 +268,9 @@ def _extract_comments(
     ) -> List[TrackerIssueComment]:
         return [
             self._extract_comment(
-                gitlab_note=gitlab_note,
+                gitlab_note=gitlab_note,  # type: ignore
             )
-            for gitlab_note in reversed(gitlab_issue.notes.list())
+            for gitlab_note in reversed(gitlab_issue.notes.list())  # type: ignore
             if exclude_comments is None or str(gitlab_note.id) not in exclude_comments
         ]
 
@@ -433,7 +434,7 @@ def _replace_attachments_references(
                 referencing_texts = [
                     text.replace(
                         attachment.url,
-                        f"{self.configuration.url}/{self.configuration.project}{upload_url}",
+                        f"{self.configuration.url}{upload_url}",
                     )
                     for text in referencing_texts
                 ]
@@ -468,10 +469,17 @@ def _upload_attachments(
                     ),
                 )
             else:
+                gitlab_version = version.parse(self._gitlab.version()[0])
+
+                if gitlab_version >= version.parse("15.10"):
+                    upload_path = upload["full_path"]
+                else:
+                    upload_path = upload["url"]
+
                 uploads.append(
                     (
                         attachment,
-                        upload["url"],
+                        upload_path,
                         None,
                     ),
                 )