From 505d7c114a87f7bb81d85915fe26c5c612246cc3 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 10:34:38 +0100 Subject: [PATCH 01/23] Upgrading to v2 rtd config file --- .readthedocs.yml | 14 ++++++++++++-- misc/doc/requirements.txt | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 misc/doc/requirements.txt diff --git a/.readthedocs.yml b/.readthedocs.yml index f0b68e4b..d9805bd2 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,3 +1,13 @@ +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3.12" +sphinx: + configuration: misc/doc/sources/conf.py +formats: all + python: - extra_requirements: - - renku-sphinx-theme + install: + - requirements: misc/doc/requirements.txt diff --git a/misc/doc/requirements.txt b/misc/doc/requirements.txt new file mode 100644 index 00000000..b69979e6 --- /dev/null +++ b/misc/doc/requirements.txt @@ -0,0 +1 @@ +renku-sphinx-theme~=0.3.0 From 5be2c83aa87592b4afc68aa93c171c4f1cf71e10 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 10:42:40 +0100 Subject: [PATCH 02/23] DO sponsoring is done for this year. --- misc/doc/sources/index.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/misc/doc/sources/index.rst b/misc/doc/sources/index.rst index f80faf77..740b910f 100644 --- a/misc/doc/sources/index.rst +++ b/misc/doc/sources/index.rst @@ -8,13 +8,6 @@ Based on strong message routing algorithms, Jasmin provides flexibility to defin Jasmin is written in Python and Twisted framework for serving highly scalable applications, SMS message delivery can be done through HTTP and SMPP protocols, intelligent routing can be configured in real-time through an API, cli interface or a web backend [1]_. -.. figure:: https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.svg - :target: https://www.digitalocean.com/ - :alt: Powered by DigitalOcean - :align: Center - :width: 210px - :scale: 80 % - Features ******** From ccd92ba494356a70bb762f4db92941a21f30482e Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 10:54:07 +0100 Subject: [PATCH 03/23] Do not build pdf format --- .readthedocs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index d9805bd2..6df0f100 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -6,8 +6,8 @@ build: python: "3.12" sphinx: configuration: misc/doc/sources/conf.py -formats: all - +formats: + - epub python: install: - requirements: misc/doc/requirements.txt From 1307372f19e3f5dde490592117549a69aa7fd288 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:25:59 +0100 Subject: [PATCH 04/23] Changed docs theme and reqs cleansing --- misc/doc/requirements.txt | 2 +- misc/doc/sources/conf.py | 2 +- requirements-test.txt | 1 - requirements.txt | 5 +---- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/misc/doc/requirements.txt b/misc/doc/requirements.txt index b69979e6..33bc8706 100644 --- a/misc/doc/requirements.txt +++ b/misc/doc/requirements.txt @@ -1 +1 @@ -renku-sphinx-theme~=0.3.0 +furo~=2023.9.10 diff --git a/misc/doc/sources/conf.py b/misc/doc/sources/conf.py index 468c356e..6c3f2a4f 100644 --- a/misc/doc/sources/conf.py +++ b/misc/doc/sources/conf.py @@ -79,7 +79,7 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = "renku" +html_theme = "furo" # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/requirements-test.txt b/requirements-test.txt index 2de617ed..6a95c335 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,5 @@ testfixtures>=3.0.0 sphinx>=1.1.0 -renku-sphinx-theme pylint coverage coveralls diff --git a/requirements.txt b/requirements.txt index 3b4d96d2..cedad455 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,13 +24,10 @@ cryptography~=37.0.4 # Added in 0.9rc16: celery>=4.0.0 redis~=3.4.1 -requests~=2.23.0 +requests~=2.25.0 # For REST API python-mimeparse~=1.6.0 # For /metrics (prometheus exporter) prometheus-client~=0.14.1 - -# Documentation theme for readthedocs -renku-sphinx-theme~=0.2.2 From 126c0ba9aa924f70290e0753719fa1c63d17df56 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:45:44 +0100 Subject: [PATCH 05/23] addressing dependabot issues --- requirements.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index cedad455..c3e10ea3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,10 @@ pyasn1~=0.4.8 pyOpenSSL~=19.1.0 -Twisted~=22.1.0 + +# Upgraded on dependabot issue +# https://github.com/jookies/jasmin/security/dependabot/19 +Twisted~=23.10.0 + # install twisted requests since they changed how that all works treq~=22.1.0 pyparsing~=2.4.7 @@ -17,14 +21,17 @@ smpp.pdu3~=0.6 smpp.twisted3~=0.7 python-messaging~=0.5.13 -# Freezinng cryptography version because of a bug in >=38.0.0 -# https://github.com/pyca/cryptography/issues/7617 -cryptography~=37.0.4 +# Upgrade to 41.0.4 +# https://github.com/jookies/jasmin/security/dependabot/17 +cryptography>=41.0.4 # Added in 0.9rc16: celery>=4.0.0 redis~=3.4.1 -requests~=2.25.0 + +# Upgraded on dependabot issue +# https://github.com/jookies/jasmin/security/dependabot/14 +requests~=2.31.0 # For REST API python-mimeparse~=1.6.0 From d4def1ff3c67098f11373def673964b4a51e3e43 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 11:53:42 +0100 Subject: [PATCH 06/23] Can't upgrade twisted now due to txredisapi dependency --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index c3e10ea3..775b9bcc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ pyasn1~=0.4.8 pyOpenSSL~=19.1.0 -# Upgraded on dependabot issue +# @TODO: Upgrade on dependabot issue # https://github.com/jookies/jasmin/security/dependabot/19 -Twisted~=23.10.0 +Twisted~=22.1.0 # install twisted requests since they changed how that all works treq~=22.1.0 From bddbbaa496f490865a2827d73681fe09335651d3 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:26:21 +0100 Subject: [PATCH 07/23] - removed old python version from workflow - adjusted pylintrc --- .github/workflows/ci.yml | 2 +- misc/pylint/pylintrc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c184d368..41fcbfa8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - 6379:6379 strategy: matrix: - python: [3.7, 3.8, 3.9, '3.10', 3.11] + python: [3.9, '3.10', 3.11, 3.12] steps: - uses: actions/checkout@v2 - name: Install os dependencies diff --git a/misc/pylint/pylintrc b/misc/pylint/pylintrc index ca905794..18fc7e0a 100644 --- a/misc/pylint/pylintrc +++ b/misc/pylint/pylintrc @@ -12,7 +12,7 @@ profile=no # Add files or directories to the blacklist. They should be base names, not # paths. -ignore=.gitignore,vendor,tests,test +ignore=.gitignore,vendor,tests,test,misc,kubernetes,docker # Pickle collected data for later comparisons. persistent=no @@ -33,7 +33,7 @@ load-plugins= # can either give multiple identifier separated by comma (,) or put this option # multiple time (only on the command line, not in the configuration file where # it should appear only once). -disable=E1101,E1102,E1103,E0601,R0801,R0902,R0903,R0904,R0913,W0614,W0232,W0613,W0201,W0703,W0511,W0233,W0702,W0150,W0104,R0911,W0221,E0611,F0401 +disable=E1101,E1102,E1103,E0601,R0801,R0902,R0903,R0904,R0913,W0614,W0613,W0201,W0703,W0511,W0233,W0702,W0150,W0104,R0911,W0221,E0611,F0401 [REPORTS] From 91de8fd7377ed35a9cd52dbe2d3888d2008a1f79 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:31:11 +0100 Subject: [PATCH 08/23] Removed old python versions (cryptography lib requiremnet) --- .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 41fcbfa8..7685fd33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - 6379:6379 strategy: matrix: - python: [3.9, '3.10', 3.11, 3.12] + python: [3.11, 3.12] steps: - uses: actions/checkout@v2 - name: Install os dependencies From 6b321de796ebf5389b0a78ded433654510b67c4a Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:34:10 +0100 Subject: [PATCH 09/23] added timeout for job --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7685fd33..f5bb6423 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ env: jobs: build: runs-on: ubuntu-latest + timeout-minutes: 10 services: rabbitmq: image: rabbitmq:3-alpine From c38ab4e22dca977163c1d9c0126519a23c7ea1bd Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:40:37 +0100 Subject: [PATCH 10/23] pylintrc adjustment --- misc/pylint/pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/pylint/pylintrc b/misc/pylint/pylintrc index 18fc7e0a..63313cf6 100644 --- a/misc/pylint/pylintrc +++ b/misc/pylint/pylintrc @@ -33,7 +33,7 @@ load-plugins= # can either give multiple identifier separated by comma (,) or put this option # multiple time (only on the command line, not in the configuration file where # it should appear only once). -disable=E1101,E1102,E1103,E0601,R0801,R0902,R0903,R0904,R0913,W0614,W0613,W0201,W0703,W0511,W0233,W0702,W0150,W0104,R0911,W0221,E0611,F0401 +disable=E1101,E1102,E1103,E0601,R0801,R0902,R0903,R0904,R0913,W0614,W0613,W0201,W0703,W0511,W0233,W0702,W0150,W0104,R0911,W0221,E0611,F0401,R1705 [REPORTS] From d434e65fbbf4518b41fbdda16d3dfe129ff3293f Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:41:29 +0100 Subject: [PATCH 11/23] min. py version is 3.7 for ci --- .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 f5bb6423..bcae18d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: - 6379:6379 strategy: matrix: - python: [3.11, 3.12] + python: [3.7, 3.9, '3.10', 3.11, 3.12] steps: - uses: actions/checkout@v2 - name: Install os dependencies From dd2a504d22b87c006db9de6d1c0e33d043724fb4 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:46:01 +0100 Subject: [PATCH 12/23] lowered cryptography version requirement --- .github/workflows/ci.yml | 1 - requirements.txt | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcae18d6..44daa341 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,6 @@ env: jobs: build: runs-on: ubuntu-latest - timeout-minutes: 10 services: rabbitmq: image: rabbitmq:3-alpine diff --git a/requirements.txt b/requirements.txt index 775b9bcc..8f5c21a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,9 +21,9 @@ smpp.pdu3~=0.6 smpp.twisted3~=0.7 python-messaging~=0.5.13 -# Upgrade to 41.0.4 -# https://github.com/jookies/jasmin/security/dependabot/17 -cryptography>=41.0.4 +# Upgrade to 39.0.1 +# https://github.com/jookies/jasmin/security/dependabot/10 +cryptography>=39.0.1 # Added in 0.9rc16: celery>=4.0.0 From bcb457880f8caf3118c4653ec6cd4e72ecee06ac Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 12:48:31 +0100 Subject: [PATCH 13/23] cryptography version fix --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8f5c21a4..ce9a2c7d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ python-messaging~=0.5.13 # Upgrade to 39.0.1 # https://github.com/jookies/jasmin/security/dependabot/10 -cryptography>=39.0.1 +cryptography~=39.0.1 # Added in 0.9rc16: celery>=4.0.0 From f9db03f6b44109a618d40844aebff4b6c627cc81 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 19:19:21 +0100 Subject: [PATCH 14/23] bumping versions --- requirements.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index ce9a2c7d..f4241002 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,9 +21,10 @@ smpp.pdu3~=0.6 smpp.twisted3~=0.7 python-messaging~=0.5.13 -# Upgrade to 39.0.1 -# https://github.com/jookies/jasmin/security/dependabot/10 -cryptography~=39.0.1 +# Upgrade to min. 41.0.5 +# https://github.com/jookies/jasmin/security/dependabot/19 +cryptography~=41.0.5 +pyopenssl~=23.3.0 # Added in 0.9rc16: celery>=4.0.0 From 4645910bcca6b6665e55324af93f149bcd92f720 Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 19:24:30 +0100 Subject: [PATCH 15/23] bump jasmin version to a new 0.11 branch --- jasmin/__init__.py | 4 ++-- misc/doc/sources/conf.py | 4 ++-- nfpm.yaml | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jasmin/__init__.py b/jasmin/__init__.py index 45638c3d..7d1c6539 100644 --- a/jasmin/__init__.py +++ b/jasmin/__init__.py @@ -6,8 +6,8 @@ import re MAJOR = 0 -MINOR = 10 -PATCH = 14 +MINOR = 11 +PATCH = 0 META = '' diff --git a/misc/doc/sources/conf.py b/misc/doc/sources/conf.py index 6c3f2a4f..2fe000fc 100644 --- a/misc/doc/sources/conf.py +++ b/misc/doc/sources/conf.py @@ -36,9 +36,9 @@ # built documents. # # The short X.Y version. -version = "0.10" +version = "0.11" # The full version, including alpha/beta/rc tags. -release = "0.10.14" +release = "0.11.0" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/nfpm.yaml b/nfpm.yaml index ebff2326..3e0d05d4 100644 --- a/nfpm.yaml +++ b/nfpm.yaml @@ -1,7 +1,7 @@ name: "jasmin-sms-gateway" arch: "amd64" platform: "linux" -version: "v0.10.14" +version: "v0.11.0" section: "default" priority: "extra" maintainer: "Jookies LTD " diff --git a/setup.py b/setup.py index 9c910bd3..3f78ce30 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def parse_requirements(filename): setup( name="jasmin", - version='0.10.14', + version='0.11.0', author="Jookies LTD", author_email="jasmin@jookies.net", url="https://www.jasminsms.com", From 73cb7bd08f5babaebb2339e56fe8d1fc26f757db Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 19:57:43 +0100 Subject: [PATCH 16/23] Bumping twisted version --- requirements.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index f4241002..a451013e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,9 @@ pyasn1~=0.4.8 -pyOpenSSL~=19.1.0 # @TODO: Upgrade on dependabot issue # https://github.com/jookies/jasmin/security/dependabot/19 -Twisted~=22.1.0 +Twisted~=23.10.0 -# install twisted requests since they changed how that all works treq~=22.1.0 pyparsing~=2.4.7 python-dateutil~=2.8.1 @@ -16,9 +14,9 @@ falcon~=2.0.0 txredisapi~=1.4.7 tabulate~=0.8.7 -txAMQP3~=0.9.3 +txAMQP3~=0.9.4 smpp.pdu3~=0.6 -smpp.twisted3~=0.7 +smpp.twisted3~=0.8 python-messaging~=0.5.13 # Upgrade to min. 41.0.5 From 57be3c99fce99e519203425ac09c7959b5d30acb Mon Sep 17 00:00:00 2001 From: farirat <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 20:19:19 +0100 Subject: [PATCH 17/23] pylintrc update --- misc/pylint/pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/pylint/pylintrc b/misc/pylint/pylintrc index 63313cf6..18fc7e0a 100644 --- a/misc/pylint/pylintrc +++ b/misc/pylint/pylintrc @@ -33,7 +33,7 @@ load-plugins= # can either give multiple identifier separated by comma (,) or put this option # multiple time (only on the command line, not in the configuration file where # it should appear only once). -disable=E1101,E1102,E1103,E0601,R0801,R0902,R0903,R0904,R0913,W0614,W0613,W0201,W0703,W0511,W0233,W0702,W0150,W0104,R0911,W0221,E0611,F0401,R1705 +disable=E1101,E1102,E1103,E0601,R0801,R0902,R0903,R0904,R0913,W0614,W0613,W0201,W0703,W0511,W0233,W0702,W0150,W0104,R0911,W0221,E0611,F0401 [REPORTS] From 4c0249af60d0de12102ced6b805831fedf4451eb Mon Sep 17 00:00:00 2001 From: The Z <1020111+farirat@users.noreply.github.com> Date: Fri, 10 Nov 2023 20:30:03 +0100 Subject: [PATCH 18/23] Update ci.yml --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a837042c..2fb6ab0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,7 @@ on: branches: - 'master' - '0.10-develop' - - '0.10.*' - '0.11-develop' - - '0.11.*' env: GITHUB_TOKEN: ${{ secrets.COVERALLS_TOKEN }} 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 19/23] 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 20/23] 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 21/23] 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 22/23] 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 23/23] 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