From ba01cd35e141e414654b66052d7cb38a9db9befa Mon Sep 17 00:00:00 2001
From: Bastian Germann <bastiangermann@fishpost.de>
Date: Sat, 13 Oct 2018 00:11:04 +0200
Subject: [PATCH] Optionally depend on launchpadlib

---
 openlp/core/ui/aboutdialog.py | 4 ++--
 scripts/check_dependencies.py | 3 ++-
 setup.py                      | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index cc3cd862a..6ad6eeeeb 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -112,8 +112,8 @@ class UiAboutDialog(object):
                       'Andreas "googol" Preikschat', 'Ken "alisonken1" Roberts', 'Raoul "superfly" Snyman',
                       'Jonathan "springermac" Springer', 'Philip "Phill" Ridout']
         contributors = ['Stuart "sibecker" Becker', 'Gerald "jerryb" Britton', 'Jonathan "gushie" Corwin',
-                        'Samuel "MrGamgee" Findlay', 'Michael "cocooncrash" Gorven', 'Scott "sguerrieri" Guerrieri',
-                        'Simon Hanna', 'Chris Hill',
+                        'Samuel "MrGamgee" Findlay', 'Bastian Germann', 'Michael "cocooncrash" Gorven',
+                        'Scott "sguerrieri" Guerrieri', 'Simon Hanna', 'Chris Hill',
                         'Matthias "matthub" Hub', 'Meinert "m2j" Jordan', 'Ian Knightly'
                         'Armin "orangeshirt" K\xf6hler',
                         'Rafael "rafaellerm" Lerm', 'Gabriel loo', 'Erik "luen" Lundin', 'Edwin "edwinlunando" Lunando',
diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py
index a0eef5623..3dfb341d8 100755
--- a/scripts/check_dependencies.py
+++ b/scripts/check_dependencies.py
@@ -97,11 +97,12 @@ OPTIONAL_MODULES = [
     ('mysql.connector', '(MySQL support)'),
     ('pyodbc', '(ODBC support)'),
     ('psycopg2', '(PostgreSQL support)'),
-    ('jenkins', '(access jenkins api - package name: jenkins-webapi)'),
     ('enchant', '(spell checker)'),
     ('pysword', '(import SWORD bibles)'),
     ('uno', '(LibreOffice/OpenOffice support)'),
     # development/testing modules
+    ('jenkins', '(access jenkins api)'),
+    ('launchpadlib', '(launchpad script support)'),
     ('nose2', '(testing framework)'),
     ('pylint', '(linter)')
 ]
diff --git a/setup.py b/setup.py
index 8693fb3b8..1fe60169c 100755
--- a/setup.py
+++ b/setup.py
@@ -138,6 +138,7 @@ elif sys.platform.startswith('darwin'):
         'pyobjc-framework-Cocoa'
     ])
 elif sys.platform.startswith('linux'):
+    # dbus-python could be replaced by PyQt5.QtDBus
     requires.append('dbus-python')
 
 setup(
@@ -194,14 +195,16 @@ using a computer and a data projector.""",
     python_requires='>=3.6',
     install_requires=requires,
     extras_require={
-        'jenkins': ['python-jenkins'],
         'mysql': ['mysql-connector-python'],
         'odbc': ['pyodbc'],
         'postgresql': ['psycopg2'],
         'spellcheck': ['pyenchant >= 1.6'],
-        'sword-bibles': ['pysword']
+        'sword-bibles': ['pysword'],
+        # Required for scripts/*.py:
+        'jenkins': ['python-jenkins'],
+        'launchpad': ['launchpadlib']
     },
-    tests_require=['nose2', 'PyICU', 'pylint'],
+    tests_require=['nose2', 'PyICU', 'pylint', 'pyodbc', 'pysword'],
     test_suite='nose2.collector.collector',
     entry_points={'gui_scripts': ['openlp = openlp.__main__:start']}
 )