From 791b216e99b39d4550d69feab46413e1ce385a3b Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Thu, 11 Nov 2021 13:22:42 +0100
Subject: [PATCH 1/6] Update tests.yml

bump python version from 3.7 to 3.9.2
---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ab8f4c8..b59874c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.7
+    - name: Set up Python 3.9.2
       uses: actions/setup-python@v1
       with:
-        python-version: 3.7
+        python-version: 3.9.2
 
     - name: Clone repo
       run: |

From e0ce649f31cf4269bb0731254c683b0cd867b7c4 Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Thu, 11 Nov 2021 13:24:20 +0100
Subject: [PATCH 2/6] Update tests.yml

Switch from python 3.9.2 to 3.9.8 which is supported by github actions
---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b59874c..660e693 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,10 +9,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.9.2
+    - name: Set up Python 3.9.8
       uses: actions/setup-python@v1
       with:
-        python-version: 3.9.2
+        python-version: 3.9.8
 
     - name: Clone repo
       run: |

From b3a13adfa23c9b1025616cf89865565b4dc6ade6 Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Thu, 11 Nov 2021 13:26:08 +0100
Subject: [PATCH 3/6] bump feedparser to 6.0.8

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 96e9ee5..1e49807 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ pyowm==3.1.1                    # weather
 Pillow>=7.1.1                   # imaging
 icalendar==4.0.6                # iCalendar parsing
 recurring-ical-events==0.1.17b0 # parse recurring events
-feedparser==5.2.1               # parse RSS-feeds
+feedparser==6.0.8               # parse RSS-feeds
 numpy>=1.18.2                   # image pre-processing #pre-installed on Raspbian, omitting
 arrow==0.17.0 	                # time operations
 Flask==1.1.2                    # webserver

From fd93ee5525fed9c58b600da4a8f619751d458d0d Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Thu, 11 Nov 2021 13:26:49 +0100
Subject: [PATCH 4/6] bump feedparser to 6.0.8

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 10717bb..e59539e 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ __install_requires__ = ['pyowm==3.1.1',                   # weather
                         'Pillow>=7.1.1' ,                 # imaging
                         'icalendar==4.0.6',               # iCalendar parsing
                         'recurring-ical-events==0.1.17b0',# parse recurring events
-                        'feedparser==5.2.1',              # RSS-feeds
+                        'feedparser==6.0.8',              # RSS-feeds
                         # 'numpy>=1.18.2',                  # image pre-processing -> removed for issues with rpi os
                         'arrow==0.17.0',                  # time handling
                         'Flask==1.1.2',                   # webserver

From 8a39fcd0e6998374e45a8a04f63659fbc7e86a9e Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Thu, 11 Nov 2021 13:35:21 +0100
Subject: [PATCH 5/6] Create main.yml

add workflow for hotfix branch
---
 .github/workflows/main.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..afd1b77
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,28 @@
+name: Python application
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python 3.9.8
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.9.8
+
+    - name: Clone repo
+      run: |
+        git clone https://github.com/aceisace/Inkycal -b hotfix/feedparser-dependency
+    - name: Install dependencies and run
+      run: |
+        python -m pip install --upgrade pip
+        cd Inkycal
+        pip3 install -e ./
+        cd inkycal/modules && ls -al
+        cd ..
+        cd tests
+        for f in *.py; do python3 "$f"; done

From 5685c83ac6f8b46e3ca192e1952e91375b62b91e Mon Sep 17 00:00:00 2001
From: Ace <saadnaseer63@yahoo.de>
Date: Thu, 11 Nov 2021 13:40:50 +0100
Subject: [PATCH 6/6] Delete main.yml

feedparser dependency fixed
---
 .github/workflows/main.yml | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index afd1b77..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Python application
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python 3.9.8
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.9.8
-
-    - name: Clone repo
-      run: |
-        git clone https://github.com/aceisace/Inkycal -b hotfix/feedparser-dependency
-    - name: Install dependencies and run
-      run: |
-        python -m pip install --upgrade pip
-        cd Inkycal
-        pip3 install -e ./
-        cd inkycal/modules && ls -al
-        cd ..
-        cd tests
-        for f in *.py; do python3 "$f"; done