From 4560ad05bae11823897185e27f6dd515d9fbd66a Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sat, 22 Mar 2025 16:40:28 +0100
Subject: [PATCH 01/13] Remove license scanning which got integrated into
dependency scanning.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The legacy License Compliance analyzer was deprecated in GitLab 15.9 and removed in GitLab 16.3. Bugs and vulnerabilities in this legacy analyzer will no longer be fixed. This error message can be resolved by removing Jobs/License-Scanning.gitlab-ci.yml from your CI configuration.
Detection of software dependency licenses is now enabled by including Dependency Scanning as part of your project’s CI configuration. However, the legacy License Compliance analyzer may still be used by updating the LICENSE_MANAGEMENT_VERSION variable to 4 in your CI configuration. Please see https://docs.gitlab.com/ee/user/compliance/license_scanning_of_cyclonedx_files for more information.
---
.gitlab-ci.yml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4f820d..0870719 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,15 +96,11 @@ dependency_scanning:
- echo "No before script pls"
stage: security
-license_scanning:
- before_script:
- - echo "No before script pls"
- stage: security
include:
- template: Security/SAST.gitlab-ci.yml
- template: Security/Dependency-Scanning.gitlab-ci.yml
- - template: Security/License-Scanning.gitlab-ci.yml
+
build_and_upload:
stage: package
--
GitLab
From 4395783a7c456939e4f7567817537203c68c90fc Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sat, 22 Mar 2025 18:05:20 +0100
Subject: [PATCH 02/13] Try python3.12 (lower versions are in security rls
only, 3.12 and 3.13 are still getting maintenance updates)
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0870719..7c3bd61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: python:3.10
+image: python:3.11
stages:
- linting
- testing
--
GitLab
From 1d28a13642cf8380fcb5da6242ad2da53da3a17c Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sat, 22 Mar 2025 18:33:12 +0100
Subject: [PATCH 03/13] Try 3.12 instead of 3.11 Run docs on non-main commits
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c3bd61..3f319f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: python:3.11
+image: python:3.12
stages:
- linting
- testing
@@ -79,8 +79,8 @@ pages:
artifacts:
paths:
- public
- rules:
- - if: "$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH"
+ # rules:
+ # - if: "$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH"
sast:
before_script:
--
GitLab
From 6426013a3f98b55dce7ca790013b30ac901268fe Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sat, 22 Mar 2025 19:28:11 +0100
Subject: [PATCH 04/13] Try 3.13 because 3.12 threw an error
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f319f6..f6ad9fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: python:3.12
+image: python:3.13
stages:
- linting
- testing
--
GitLab
From 05ffa521d3eb6cd289797332d72e98e1b7baabeb Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 14:57:53 +0100
Subject: [PATCH 05/13] Try newest versions
---
pyproject.toml | 4 ++--
requirements.txt | 32 ++++++++++++++++----------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 3584424..d03a715 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
[build-system]
-requires = ["setuptools>=61", "wheel"]
+requires = ["setuptools>=77", "wheel"]
build-backend = "setuptools.build_meta"
[project]
@@ -19,7 +19,7 @@ requires-python = ">=3.10"
classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.13",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
"Development Status :: 3 - Alpha",
diff --git a/requirements.txt b/requirements.txt
index ddb80f7..75406a9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,16 @@
-coverage==7.3.0
-cycler==0.11.0
-fonttools==4.42.1
-kiwisolver==1.4.5
-matplotlib==3.7.2
-myst-parser==2.0.0
-numpy==1.25.2
-packaging==23.1
-Pillow==10.0.0
-pyparsing==3.0.9
-python-dateutil==2.8.2
-qrcode==7.4.2
-six==1.16.0
-Sphinx==7.2.5
-sphinx-autoapi==2.1.1
-sphinx-rtd-theme==1.3.0
+coverage==7.7.1
+cycler==0.12.1
+fonttools==4.56.0
+kiwisolver==1.4.8
+matplotlib==3.10.1
+myst-parser==4.0.1
+numpy==2.2.4
+packaging==24.2
+Pillow==11.1.0
+pyparsing==3.2.1
+python-dateutil==2.9.0.post0
+qrcode==8.0
+six==1.17.0
+Sphinx==8.2.3
+sphinx-autoapi==3.6.0
+sphinx-rtd-theme==3.0.2
--
GitLab
From ec7536e5af9a103f35b9761e8ce54162c832b979 Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 15:07:50 +0100
Subject: [PATCH 06/13] Revert "Try newest versions"
This reverts commit 05ffa521d3eb6cd289797332d72e98e1b7baabeb
---
pyproject.toml | 4 ++--
requirements.txt | 32 ++++++++++++++++----------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index d03a715..3584424 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
[build-system]
-requires = ["setuptools>=77", "wheel"]
+requires = ["setuptools>=61", "wheel"]
build-backend = "setuptools.build_meta"
[project]
@@ -19,7 +19,7 @@ requires-python = ">=3.10"
classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.13",
+ "Programming Language :: Python :: 3.10",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
"Development Status :: 3 - Alpha",
diff --git a/requirements.txt b/requirements.txt
index 75406a9..ddb80f7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,16 @@
-coverage==7.7.1
-cycler==0.12.1
-fonttools==4.56.0
-kiwisolver==1.4.8
-matplotlib==3.10.1
-myst-parser==4.0.1
-numpy==2.2.4
-packaging==24.2
-Pillow==11.1.0
-pyparsing==3.2.1
-python-dateutil==2.9.0.post0
-qrcode==8.0
-six==1.17.0
-Sphinx==8.2.3
-sphinx-autoapi==3.6.0
-sphinx-rtd-theme==3.0.2
+coverage==7.3.0
+cycler==0.11.0
+fonttools==4.42.1
+kiwisolver==1.4.5
+matplotlib==3.7.2
+myst-parser==2.0.0
+numpy==1.25.2
+packaging==23.1
+Pillow==10.0.0
+pyparsing==3.0.9
+python-dateutil==2.8.2
+qrcode==7.4.2
+six==1.16.0
+Sphinx==7.2.5
+sphinx-autoapi==2.1.1
+sphinx-rtd-theme==1.3.0
--
GitLab
From 686abc783ca8b69c563976144c9b0393d8a3eb79 Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 15:10:24 +0100
Subject: [PATCH 07/13] Try only with newer setuptools
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 3584424..9906053 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
[build-system]
-requires = ["setuptools>=61", "wheel"]
+requires = ["setuptools>=77", "wheel"]
build-backend = "setuptools.build_meta"
[project]
--
GitLab
From 60b19a95c41b95ccc08a644064c61465d85e2618 Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 15:13:20 +0100
Subject: [PATCH 08/13] Try numpy 2.2.4 since this seems to break when
installing
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index ddb80f7..eb7ca53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ fonttools==4.42.1
kiwisolver==1.4.5
matplotlib==3.7.2
myst-parser==2.0.0
-numpy==1.25.2
+numpy==2.2.4
packaging==23.1
Pillow==10.0.0
pyparsing==3.0.9
--
GitLab
From 9c675e6592aac3e3b62689b9320aeca11c2b6d13 Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 15:14:31 +0100
Subject: [PATCH 09/13] next newer pillow
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index eb7ca53..83f0136 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ matplotlib==3.7.2
myst-parser==2.0.0
numpy==2.2.4
packaging==23.1
-Pillow==10.0.0
+Pillow==11.1.0
pyparsing==3.0.9
python-dateutil==2.8.2
qrcode==7.4.2
--
GitLab
From c6a785f1b36a60da56371d4bb02aef08ee84c5ad Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 15:25:46 +0100
Subject: [PATCH 10/13] reverting to older python
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f6ad9fe..745c952 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: python:3.13
+image: python:3.10
stages:
- linting
- testing
--
GitLab
From 6a0877e3d0860fe8653cd90cc6f23f6b21d73bfe Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 15:30:19 +0100
Subject: [PATCH 11/13] randomly try versions
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index 83f0136..df871e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ matplotlib==3.7.2
myst-parser==2.0.0
numpy==2.2.4
packaging==23.1
-Pillow==11.1.0
+Pillow==10.1.0
pyparsing==3.0.9
python-dateutil==2.8.2
qrcode==7.4.2
--
GitLab
From 15c2f45411955a053bda27a68ee1a4d2b9098b10 Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 15:39:54 +0100
Subject: [PATCH 12/13] use latest 1. release of numpy
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
index df871e3..769da81 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ fonttools==4.42.1
kiwisolver==1.4.5
matplotlib==3.7.2
myst-parser==2.0.0
-numpy==2.2.4
+numpy==1.26.4
packaging==23.1
Pillow==10.1.0
pyparsing==3.0.9
--
GitLab
From ba7f360893e51870ab17a6140cb6cbcaa10b8030 Mon Sep 17 00:00:00 2001
From: "Hock, Martin" <mahoromax@outlook.de>
Date: Sun, 23 Mar 2025 16:04:11 +0100
Subject: [PATCH 13/13] Revert change of creating docs for every commit
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 745c952..0870719 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,8 +79,8 @@ pages:
artifacts:
paths:
- public
- # rules:
- # - if: "$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH"
+ rules:
+ - if: "$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH"
sast:
before_script:
--
GitLab