From 50df4ae12e33f448deadd1e3c21891ffbf5e5351 Mon Sep 17 00:00:00 2001 From: Jerakin Date: Mon, 19 Feb 2024 17:56:07 +0100 Subject: [PATCH 1/5] fix: update all requirements A lot of requirements have sequrity warnings and looks quite out of date. It's good praxis to keep up to date. --- image_manager.py | 3 +-- requirements.txt | 46 +++++++++++++++++++++------------------------- wiki.py | 3 ++- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/image_manager.py b/image_manager.py index e513193..10aa385 100644 --- a/image_manager.py +++ b/image_manager.py @@ -5,8 +5,7 @@ from base64 import b32encode from hashlib import sha1 -from flask import safe_join -from werkzeug.utils import secure_filename +from werkzeug.utils import secure_filename, safe_join class ImageManager: diff --git a/requirements.txt b/requirements.txt index 1aa8693..e8fc3cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,30 +1,26 @@ -Flask==1.1.2 -GitPython==3.1.30 -itsdangerous==1.1.0 -Jinja2==2.11.3 -Markdown==3.3.3 -MarkupSafe==1.1.1 -PyYAML==6.0 -Werkzeug==1.0.1 +Flask==3.0.2 +GitPython==3.1.42 +itsdangerous==2.1.2 +Jinja2==3.1.3 +Markdown==3.5.2 +MarkupSafe==2.1.5 +PyYAML==6.0.1 +Werkzeug==3.0.1 Whoosh==2.7.4 -beautifulsoup4==4.11.1 -click==7.1.2 -gitdb==4.0.5 -idna==3.3 -itsdangerous==1.1.0 -pandoc-eqnos==2.4.0 +beautifulsoup4==4.12.3 +click==8.1.7 +gitdb==4.0.11 +idna==3.6 +pandoc-eqnos==2.5.0 pandoc-fignos==2.4.0 pandoc-secnos==2.2.2 pandoc-tablenos==2.3.0 pandoc-xnos==2.5.0 -pandocfilters==1.4.3 -psutil==5.7.3 -pypandoc==1.10 -requests==2.27.1 -smmap==3.0.4 -Werkzeug==1.0.1 -idna==3.3 -lxml==4.9.2 -Whoosh==2.7.4 -watchdog==2.1.9 -cachelib==0.6.0 +pandocfilters==1.5.1 +pypandoc==1.13 +requests==2.31.0 +smmap==5.0.1 +lxml==5.1.0 +watchdog==4.0.0 +cachelib==0.12.0 +psutil==5.9.8 \ No newline at end of file diff --git a/wiki.py b/wiki.py index 24ce9fd..5adb791 100644 --- a/wiki.py +++ b/wiki.py @@ -8,8 +8,9 @@ import knowledge_graph import secrets -from flask import Flask, render_template, request, redirect, url_for, make_response, safe_join, send_file, \ +from flask import Flask, render_template, request, redirect, url_for, make_response, send_file, \ send_from_directory +from werkzeug.utils import safe_join from threading import Thread from hashlib import sha256 from cache import Cache From 46808036a06b18842817f5d4b82717e337729480 Mon Sep 17 00:00:00 2001 From: Jerakin Date: Mon, 19 Feb 2024 19:42:21 +0100 Subject: [PATCH 2/5] retrigger checks From 1aedf425eaa5044c40c9c1f00681efde7d69cc1c Mon Sep 17 00:00:00 2001 From: linbreux <29354411+Linbreux@users.noreply.github.com> Date: Tue, 20 Feb 2024 21:48:12 +0100 Subject: [PATCH 3/5] chg: rollback Watchdog version to pass CI --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index e8fc3cc..7b25c49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,6 @@ pypandoc==1.13 requests==2.31.0 smmap==5.0.1 lxml==5.1.0 -watchdog==4.0.0 +watchdog==2.1.9 cachelib==0.12.0 -psutil==5.9.8 \ No newline at end of file +psutil==5.9.8 From 925429489d730bd2739fafad0052206b96c32f28 Mon Sep 17 00:00:00 2001 From: linbreux <29354411+Linbreux@users.noreply.github.com> Date: Tue, 20 Feb 2024 22:20:23 +0100 Subject: [PATCH 4/5] chg: drop support for python3.7 and start support for python3.10 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 18d9a5b..a22430b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: [3.8, 3.9, 3.10] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From 2d9c9d01089e7d896adbe08d318d0d9b7539a76b Mon Sep 17 00:00:00 2001 From: linbreux <29354411+Linbreux@users.noreply.github.com> Date: Tue, 20 Feb 2024 22:25:37 +0100 Subject: [PATCH 5/5] fix: python version as string https://github.com/actions/runner/issues/1989 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a22430b..1db1fe9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8, 3.9, 3.10] + python-version: ['3.8', '3.9', '3.10'] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }}