From dbd4ce48e656308aacef313c172b421159f21c8b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 28 Jun 2018 11:43:32 +0200
Subject: [PATCH] Downgrade and filter PyYAML 4.1

This reverts commit 96defc5dc275418c7753f93344066c68e13f69a3.

With PyYAML 4.1 we don't have C extensions on Travis CI:
https://github.com/yaml/pyyaml/issues/179
https://github.com/yaml/pyyaml/issues/182

Unfortunately, cython isn't in the APT whitelist either:
https://github.com/travis-ci/apt-source-whitelist/issues/37
---
 misc/requirements/requirements-qutebrowser.txt-raw | 4 +++-
 misc/requirements/requirements-tests-git.txt       | 6 +++++-
 requirements.txt                                   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw
index c66c65beb..506af17c0 100644
--- a/misc/requirements/requirements-qutebrowser.txt-raw
+++ b/misc/requirements/requirements-qutebrowser.txt-raw
@@ -1,7 +1,9 @@
 Jinja2
 Pygments
 pyPEG2
-PyYAML
+PyYAML!=4.1
 colorama
 cssutils
 attrs
+
+#@ filter: PyYAML != 4.1
diff --git a/misc/requirements/requirements-tests-git.txt b/misc/requirements/requirements-tests-git.txt
index ce00cd31c..6681dd15e 100644
--- a/misc/requirements/requirements-tests-git.txt
+++ b/misc/requirements/requirements-tests-git.txt
@@ -35,4 +35,8 @@ git+https://github.com/pallets/markupsafe.git
 hg+http://bitbucket.org/birkenfeld/pygments-main
 hg+https://bitbucket.org/fdik/pypeg
 git+https://github.com/python-attrs/attrs.git
-git+https://github.com/yaml/pyyaml.git
+
+# Fails to build:
+# gcc: error: ext/_yaml.c: No such file or directory
+# hg+https://bitbucket.org/xi/pyyaml
+PyYAML==3.12
diff --git a/requirements.txt b/requirements.txt
index 4d4e1972e..842b0c42d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,4 @@ Jinja2==2.10
 MarkupSafe==1.0
 Pygments==2.2.0
 pyPEG2==2.15.2
-PyYAML==4.1
+PyYAML==3.12  # rq.filter: != 4.1