From 77d71e56523b7ce747012a6135cf5ac6527fdba1 Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Thu, 18 Oct 2018 01:19:41 -0300
Subject: [PATCH 1/4] Add missing changelog entry

---
 CHANGELOG.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bd34ec6c..f23419a0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ v3.4.1
 ------
 * Support Python 3.7.
 * Support click>=7.0.
+* Properly parse RBGA colours.
 
 v3.4.0
 ------

From 93dea301bf11b9b83aca31370776966a2115ee93 Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Wed, 24 Oct 2018 13:01:29 -0300
Subject: [PATCH 2/4] Remove unused variable

---
 todoman/model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/todoman/model.py b/todoman/model.py
index 6f1bde3b..024dd582 100644
--- a/todoman/model.py
+++ b/todoman/model.py
@@ -929,7 +929,7 @@ def update_cache(self):
                     cal = icalendar.Calendar.from_ical(cal)
                     for component in cal.walk('VTODO'):
                         self.cache.add_vtodo(component, entry_path)
-            except Exception as e:
+            except Exception:
                 logger.exception("Failed to read entry %s.", entry_path)
 
         self.cache.save_to_disk()

From 40cbf5ecae6e89e7a6570d9459d7d0aa138c1fec Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Wed, 24 Oct 2018 13:20:26 -0300
Subject: [PATCH 3/4] Fix CI crashes on macOS

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

diff --git a/.travis.yml b/.travis.yml
index bc2bf578..8f48cd22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,7 @@ jobs:
       env: TOXENV=py
       before_install:
         - brew update
+        - brew link --overwrite gcc
         - brew upgrade python
         - pip3 install -U virtualenv  # Travis' images rename pip to pip3.
         - virtualenv env -p python3

From 7425dd77ad2d23877dc515fe12c97d81ce4b8ede Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Fri, 9 Nov 2018 11:01:46 -0300
Subject: [PATCH 4/4] Allow macOS to fail

Since this has been broken for a while, and it seems non-trivial to fix
(or rather, lack of time/interest), allow CI to fail for macOS so we can
unfreeze master.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 8f48cd22..5816f19d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,3 +66,4 @@ jobs:
 matrix:
   allow_failures:
     - python: pypy3.3-5.2-alpha1
+    - os: osx