From b5988694508e374594b5ffef488851f56676d835 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Fri, 4 Dec 2020 18:48:49 +0700
Subject: [PATCH 1/5] .travis.yml: Add taskwarrior

Taskwarrior package requires task to be installed.
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee38e1e..079ecc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,7 @@ addons:
   apt:
     packages:
       libdbus-1-dev
-      libffi-dev
-      python3-pygit2
+      taskwarrior
 install:
   - pip install -U coverage pytest pytest-mock freezegun
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u|grep -v dbus-python|grep -v libvirt-python|grep -v Pillow|grep -v pygit2)

From d0e309ad0f72350e2833d9c84ff523c7f5f7ebb0 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Sat, 5 Dec 2020 05:48:59 +0700
Subject: [PATCH 2/5] test_format: Allow 2.00TiB

---
 tests/util/test_format.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/util/test_format.py b/tests/util/test_format.py
index 1e34dec..dc69ced 100644
--- a/tests/util/test_format.py
+++ b/tests/util/test_format.py
@@ -71,7 +71,7 @@ def test_byteformat():
     assert byte(1024 + 512) == "1.50KiB"
     assert byte(1024 * 1024 * 2 + 1024 * 512) == "2.50MiB"
     assert byte(1024 * 1024 * 1024 * 4 + 1024 * 1024 * 512) == "4.50GiB"
-    assert byte(1024 * 1024 * 1024 * 1024 * 2) == "2048.00GiB"
+    assert byte(1024 * 1024 * 1024 * 1024 * 2) in ["2048.00GiB", "2.00TiB"]
 
 
 def test_duration():

From a018343af68e4e599c712548ff2193ae4d191fe8 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Sat, 5 Dec 2020 07:37:06 +0700
Subject: [PATCH 3/5] .travis.yml: Add libgit2-dev

And pre-install pygit2<1 for Python 3.4 and 3.5 support.
---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 079ecc2..7d1bbc0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,12 @@ addons:
   apt:
     packages:
       libdbus-1-dev
+      libgit2-dev
       taskwarrior
 install:
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u|grep -v dbus-python|grep -v libvirt-python|grep -v Pillow|grep -v pygit2)
+  - pip install 'pygit2<1' || true
+  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v
 after_script:

From e8728973461f6a45ab96b678e8babc4064f13253 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Fri, 4 Dec 2020 17:08:44 +0700
Subject: [PATCH 4/5] .travis.yml: Pre-install libvirt-dev

Also install libvirt-python<6.3 for Python 3.4 support.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7d1bbc0..ca3b78d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,10 +19,11 @@ addons:
     packages:
       libdbus-1-dev
       libgit2-dev
+      libvirt-dev
       taskwarrior
 install:
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install 'pygit2<1' || true
+  - pip install 'pygit2<1' 'libvirt-python<6.3' || true
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v

From 9e9dff7658d8417151b5c4f82f27749457180ad5 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Sat, 5 Dec 2020 16:54:59 +0700
Subject: [PATCH 5/5] rss.txt: Unpin feedparser

And install feedparser<6 on Travis for Python 3.4-5.
---
 .travis.yml                  | 2 +-
 requirements/modules/rss.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ca3b78d..369aeb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ addons:
       taskwarrior
 install:
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install 'pygit2<1' 'libvirt-python<6.3' || true
+  - pip install 'pygit2<1' 'libvirt-python<6.3' 'feedparser<6' || true
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v
diff --git a/requirements/modules/rss.txt b/requirements/modules/rss.txt
index 4373b0d..1b25361 100644
--- a/requirements/modules/rss.txt
+++ b/requirements/modules/rss.txt
@@ -1 +1 @@
-feedparser==6.0.0b1
+feedparser