From 38c4b46351496aa2cb8bf40e639e58246bc7efbb Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 07:56:36 +0700
Subject: [PATCH 1/5] libvirtvms.txt: Fix PyPI dependency name

Related to https://github.com/tobi-wan-kenobi/bumblebee-status/issues/741
---
 requirements/modules/libvirtvms.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/modules/libvirtvms.txt b/requirements/modules/libvirtvms.txt
index 76aa22c..ff1a357 100644
--- a/requirements/modules/libvirtvms.txt
+++ b/requirements/modules/libvirtvms.txt
@@ -1 +1 @@
-libvirt
+libvirt-python

From 659a0147da7fda458ed3d1c8751eef2483a733d9 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 08:02:12 +0700
Subject: [PATCH 2/5] system.txt: Replace tk with Pillow

Related to https://github.com/tobi-wan-kenobi/bumblebee-status/issues/741
---
 requirements/modules/system.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/modules/system.txt b/requirements/modules/system.txt
index 5d6fce4..aa8980c 100644
--- a/requirements/modules/system.txt
+++ b/requirements/modules/system.txt
@@ -1 +1 @@
-tkinter
+Pillow  # placeholder for tk

From 071a69b2d87776da26a78d0669f754f7081b578d Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 08:02:41 +0700
Subject: [PATCH 3/5] .travis.yml: Install declared PyPI dependencies

---
 .travis.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4566db0..47c124c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,13 +20,7 @@ before_install:
 install:
   - sudo apt-get install python-dbus
   - pip install -U coverage pytest pytest-mock freezegun
-  - pip install i3-py Pillow Babel DateTime python-dateutil
-  - pip install docker feedparser==6.0.0b1 i3ipc
-  - pip install netifaces power
-  - pip install psutil pytz
-  - pip install requests simplejson
-  - pip install suntime
-  - pip install tzlocal
+  - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script:
   - coverage run --source=. -m pytest tests -v
 after_script:

From 21268d7d861774e7e1a9677b6e77a8076627c1f8 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 10:55:23 +0700
Subject: [PATCH 4/5] Use dbus-python PyPI package

---
 requirements/modules/battery_upower_reqs.txt | 2 +-
 requirements/modules/spotify.txt             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/modules/battery_upower_reqs.txt b/requirements/modules/battery_upower_reqs.txt
index a7fc9f1..a8ec395 100644
--- a/requirements/modules/battery_upower_reqs.txt
+++ b/requirements/modules/battery_upower_reqs.txt
@@ -1,2 +1,2 @@
-dbus
+dbus-python
 power
diff --git a/requirements/modules/spotify.txt b/requirements/modules/spotify.txt
index e2182f1..555438c 100644
--- a/requirements/modules/spotify.txt
+++ b/requirements/modules/spotify.txt
@@ -1 +1 @@
-dbus
+dbus-python

From a58454de97d3003fc558284e92392a07bf708910 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Thu, 3 Dec 2020 12:54:44 +0700
Subject: [PATCH 5/5] .travis.yml: Allow building dbus-python

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 47c124c..72e3881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-dist: xenial
 os: linux
 language: python
 env:
@@ -15,10 +14,11 @@ before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
-before_install:
-  - sudo apt-get -qq update
+addons:
+  apt:
+    packages:
+      libdbus-1-dev
 install:
-  - sudo apt-get install python-dbus
   - pip install -U coverage pytest pytest-mock freezegun
   - pip install $(cat requirements/modules/*.txt | cut -d ' ' -f 1 | sort -u)
 script: