Merge pull request #745 from jayvdb/libvirt

.travis.yml setup

.travis.yml

@@ -18,11 +18,13 @@ addons:
   apt:
     packages:
       libdbus-1-dev
-      libffi-dev
-      python3-pygit2
+      libgit2-dev
+      libvirt-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' '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
 after_script:

requirements/modules/rss.txt

@@ -1 +1 @@
-feedparser==6.0.0b1
+feedparser

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():