From 0ef3b472aae2ed693b16d3da95b1562fefa1e6cd Mon Sep 17 00:00:00 2001
From: Magnus Hagander
Date: Tue, 5 Nov 2019 19:59:35 +0100
Subject: Make loading of qrencode and cairosvg optional

In particular, cairosvg is only used for the PNG format twitter cards,
so most functionality exists without it.

Make sure we import those modules conditionally only when needed and
handle the import exception. Also add an explicit attempt to load them
during system startup and write to the log if it fails, so it doesn't do
so silently.
---
 tools/devsetup/dev_requirements.txt      | 2 --
 tools/devsetup/dev_requirements_full.txt | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 tools/devsetup/dev_requirements_full.txt

(limited to 'tools')

diff --git a/tools/devsetup/dev_requirements.txt b/tools/devsetup/dev_requirements.txt
index 680dafc9..d2425a3d 100644
--- a/tools/devsetup/dev_requirements.txt
+++ b/tools/devsetup/dev_requirements.txt
@@ -17,5 +17,3 @@ python-dateutil
 requests
 requests-oauthlib==0.7.0
 file-magic
-qrencode
-cairosvg
diff --git a/tools/devsetup/dev_requirements_full.txt b/tools/devsetup/dev_requirements_full.txt
new file mode 100644
index 00000000..0afc5109
--- /dev/null
+++ b/tools/devsetup/dev_requirements_full.txt
@@ -0,0 +1,4 @@
+# Install these requirements as well for full functionality, but they
+# are not required for the base.
+qrencode
+cairosvg
-- 
cgit v1.2.3