diff --git a/appveyor.yml b/appveyor.yml index 19d2fe15c..ac1ee9abf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,7 +34,7 @@ install: # Update pip - python -m pip install --upgrade pip # Install generic dependencies from pypi. sqlalchemy most be 1.4 for now - - python -m pip install "sqlalchemy<1.5" alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock psycopg2-binary websockets waitress six requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF QDarkStyle python-vlc zeroconf flask-cors pytest-qt pyenchant pysword qrcode pillow + - python -m pip install "sqlalchemy<1.5" alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python pytest mock psycopg2-binary websockets waitress six requests QtAwesome PyQt5 PyQtWebEngine pymediainfo PyMuPDF QDarkStyle python-vlc flask-cors pytest-qt pyenchant pysword qrcode pillow # Install Windows only dependencies - cmd: python -m pip install pyodbc pypiwin32 - cmd: choco install vlc %CHOCO_VLC_ARG% --no-progress --limit-output diff --git a/openlp/.version b/openlp/.version index b50214693..8aadfc101 100644 --- a/openlp/.version +++ b/openlp/.version @@ -1 +1 @@ -3.0.2 +3.0.2.dev21+f22eafbeb \ No newline at end of file diff --git a/openlp/core/common/i18n.py b/openlp/core/common/i18n.py index 733450d8c..b04e4e7a4 100644 --- a/openlp/core/common/i18n.py +++ b/openlp/core/common/i18n.py @@ -458,10 +458,6 @@ class UiStrings(metaclass=Singleton): self.Video = translate('OpenLP.Ui', 'Video') self.WebDownloadText = translate('OpenLP.Ui', 'Web Interface, Download and Install Latest Version') self.WholeVerseContinuous = translate('OpenLP.Ui', 'Continuous (whole verses)') - self.ZeroconfErrorIntro = translate('OpenLP.Ui', 'There was a problem advertising OpenLP\'s remote ' - 'interface on the network:') - self.ZeroconfGenericError = translate('OpenLP.Ui', 'An unknown error occurred') - self.ZeroconfNonUniqueError = translate('OpenLP.Ui', 'OpenLP already seems to be advertising itself') book_chapter = translate('OpenLP.Ui', 'Book Chapter') chapter = translate('OpenLP.Ui', 'Chapter') verse = translate('OpenLP.Ui', 'Verse') diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index aab8168b9..5926c307d 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -139,7 +139,7 @@ class UiAboutDialog(object): '
  • pyenchant (LGPL)
  • ' '
  • pysword (MIT)
  • ' '
  • pytest (MIT)
  • ' - '
  • python-zeroconf (LGPL)
  • ' + '
  • pytest-qt (MIT)
  • ' '
  • QDarkStyle (MIT)
  • ' '
  • QtAwesome (MIT)
  • ' '
  • Requests (Apache 2.0)
  • ' @@ -150,6 +150,8 @@ class UiAboutDialog(object): '
  • websockets (BSD)
  • ' '
  • pyodbc (MIT)
  • ' '
  • psycopg2 (LGPL3+)
  • ' + '
  • qrcode (MIT)
  • ' + '
  • pillow (HPND)
  • ' '') final_credit = translate('OpenLP.AboutForm', '

    Final credit:

    ' '

    For God so loved the world that He gave His one and only Son, so that ' diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 1464d6ab5..f9f413b7e 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -94,7 +94,6 @@ MODULES = [ 'qtawesome', 'pymediainfo', 'vlc', - 'zeroconf', 'qrcode', 'PIL.ImageQt' ] diff --git a/setup.py b/setup.py index 6d2d2e321..9befc881b 100644 --- a/setup.py +++ b/setup.py @@ -120,8 +120,7 @@ using a computer and a display/projector.""", 'requests', 'SQLAlchemy < 1.5', 'waitress', - 'websockets', - 'zeroconf' + 'websockets' ], extras_require={ 'agpl-pdf': ['PyMuPDF'],