From c67fc71baf250699a3b0fc2b9acdbd50b384d0f4 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 20:36:39 +0100 Subject: [PATCH 1/5] py3.7 removed as min. python version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44daa341..e9148d55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - 6379:6379 strategy: matrix: - python: [3.7, 3.9, '3.10', 3.11, 3.12] + python: [3.8, 3.9, '3.10', 3.11, 3.12] steps: - uses: actions/checkout@v2 - name: Install os dependencies From 28908b7f61011305a59c049e7c750f09f4f4c16b Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 20:41:49 +0100 Subject: [PATCH 2/5] deb/rpm packages: minimum python version set to 3.8 --- nfpm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nfpm.yaml b/nfpm.yaml index 3e0d05d4..c2678089 100644 --- a/nfpm.yaml +++ b/nfpm.yaml @@ -83,7 +83,7 @@ scripts: overrides: deb: depends: - - python3 (>= 3.7) + - python3 (>= 3.8) - adduser - python3-twisted - python3-dateutil @@ -108,7 +108,7 @@ overrides: rpm: depends: - epel-release - - python3 (>= 3.7) + - python3 (>= 3.8) - python3-twisted - python3-dateutil - python3-pyparsing From da933aac5b90c7f6832cfbda4bb773e1151f070e Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 20:55:04 +0100 Subject: [PATCH 3/5] bumping dependecies --- requirements.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index a451013e..d080436a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ -pyasn1~=0.4.8 +pyasn1~=0.5.0 # @TODO: Upgrade on dependabot issue # https://github.com/jookies/jasmin/security/dependabot/19 Twisted~=23.10.0 -treq~=22.1.0 -pyparsing~=2.4.7 -python-dateutil~=2.8.1 -service_identity~=18.1.0 +treq~=23.11.0 +pyparsing~=3.1.1 +python-dateutil~=2.8.2 +service_identity~=23.1.0 lockfile~=0.12.2 -falcon~=2.0.0 +falcon~=3.1.1 txredisapi~=1.4.7 tabulate~=0.8.7 @@ -25,8 +25,8 @@ cryptography~=41.0.5 pyopenssl~=23.3.0 # Added in 0.9rc16: -celery>=4.0.0 -redis~=3.4.1 +celery~=5.3.5 +redis~=5.0.1 # Upgraded on dependabot issue # https://github.com/jookies/jasmin/security/dependabot/14 @@ -36,4 +36,4 @@ requests~=2.31.0 python-mimeparse~=1.6.0 # For /metrics (prometheus exporter) -prometheus-client~=0.14.1 +prometheus-client~=0.18.0 From 599c21d40c944ea378209989c31b7538d8db4153 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 20:56:43 +0100 Subject: [PATCH 4/5] bumping python version in docker images --- docker/Dockerfile.alpine | 2 +- docker/Dockerfile.restapi.alpine | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 82796d13..d2eb0672 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.11-alpine MAINTAINER Jookies LTD diff --git a/docker/Dockerfile.restapi.alpine b/docker/Dockerfile.restapi.alpine index b95cb11c..a895e62f 100644 --- a/docker/Dockerfile.restapi.alpine +++ b/docker/Dockerfile.restapi.alpine @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.11-alpine MAINTAINER Jookies LTD From 948dc6ac164249e6d4e306f377552ceba83178fc Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 21:46:12 +0100 Subject: [PATCH 5/5] added sphinx theme requirement for ci workflow pass --- requirements-test.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements-test.txt b/requirements-test.txt index 6a95c335..fa7b30a9 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -3,3 +3,6 @@ sphinx>=1.1.0 pylint coverage coveralls + +# Sphinx theme +furo~=2023.9.10