From 7e4a586a975ea3d92278157252c791bda28ba2ef Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Wed, 18 Sep 2019 23:32:50 +0200 Subject: [PATCH] Synchronize dependencies --- scripts/check_dependencies.py | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 0d5f3f5d5..0ea0fc37e 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -62,6 +62,7 @@ LINUX_MODULES = [ MACOSX_MODULES = [ 'objc', + 'Pyro4', 'AppKit' ] @@ -106,9 +107,8 @@ OPTIONAL_MODULES = [ ('uno', '(LibreOffice/OpenOffice support)'), # development/testing modules ('jenkins', '(access jenkins api)'), - ('launchpadlib', '(launchpad script support)'), ('pytest', '(testing framework)'), - ('pylint', '(linter)') + ('flake8', '(linter)') ] w = sys.stdout.write diff --git a/setup.py b/setup.py index d652789e3..739516be8 100644 --- a/setup.py +++ b/setup.py @@ -109,6 +109,7 @@ using a computer and a data projector.""", 'pyobjc-framework-Cocoa; platform_system=="Darwin"', 'PyQt5 >= 5.12', 'PyQtWebEngine', + 'Pyro4; platform_system=="Darwin"', 'python-vlc', 'pywin32; platform_system=="Windows"', 'QtAwesome', @@ -122,14 +123,13 @@ using a computer and a data projector.""", extras_require={ 'agpl-pdf': ['PyMuPDF'], 'darkstyle': ['QDarkStyle'], - 'mysql': ['pymysql'], + 'mysql': ['PyMySQL'], 'odbc': ['pyodbc'], 'postgresql': ['psycopg2'], 'spellcheck': ['pyenchant >= 1.6'], 'sword-bibles': ['pysword'], # Required for scripts/*.py: 'jenkins': ['python-jenkins'], - 'launchpad': ['launchpadlib'], 'test': [ 'PyMuPDF', 'pyodbc',