diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index bef8cb5e5..b99d437d4 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -7,16 +7,13 @@ clone_script: - mv BRANCHPATH openlp-branch environment: - PYTHON: C:\\Python34 + PYTHON: C:\\Python37-x64 install: # Install dependencies from pypi - - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python nose mock pyodbc==4.0.8 psycopg2 pypiwin32==219 pyenchant pymediainfo websockets asyncio waitress six webob requests QtAwesome" + - "%PYTHON%\\python.exe -m pip install sqlalchemy alembic appdirs chardet beautifulsoup4 lxml Mako mysql-connector-python nose mock pyodbc psycopg2 pypiwin32 pyenchant websockets asyncio waitress six webob requests QtAwesome PyQt5" # Download and install pyicu (originally from http://www.lfd.uci.edu/~gohlke/pythonlibs/) - - "%PYTHON%\\python.exe -m pip install https://get.openlp.org/win-sdk/PyICU-1.9.5-cp34-cp34m-win32.whl" - # Download and install PyQt5 - - appveyor DownloadFile http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-5.5.1/PyQt5-5.5.1-gpl-Py3.4-Qt5.5.1-x32.exe - - PyQt5-5.5.1-gpl-Py3.4-Qt5.5.1-x32.exe /S + - "%PYTHON%\\python.exe -m pip install https://get.openlp.org/win-sdk/PyICU-2.1-cp37-cp37m-win_amd64.whl" # Download and unpack mupdf - appveyor DownloadFile http://mupdf.com/downloads/archive/mupdf-1.9a-windows.zip - 7z x mupdf-1.9a-windows.zip @@ -38,11 +35,8 @@ test_script: after_test: # This is where we create a package using PyInstaller - # First get PyInstaller - - appveyor DownloadFile https://github.com/pyinstaller/pyinstaller/releases/download/v3.2/PyInstaller-3.2.zip - - 7z x PyInstaller-3.2.zip - # Install PyInstaller dependencies - - "%PYTHON%\\python.exe -m pip install future pefile" + # Install PyInstaller + - "%PYTHON%\\python.exe -m pip install pyinstaller" # Download and install Inno Setup - used for packaging - appveyor DownloadFile http://www.jrsoftware.org/download.php/is-unicode.exe - is-unicode.exe /VERYSILENT /SUPPRESSMSGBOXES /SP- diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 3dfb341d8..1a3ce8e1a 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -75,9 +75,8 @@ MODULES = [ 'PyQt5.QtOpenGL', 'PyQt5.QtSvg', 'PyQt5.QtTest', - 'PyQt5.QtWebKit', + 'PyQt5.QtWebEngineWidgets', 'PyQt5.QtMultimedia', - 'pymediainfo', 'appdirs', 'sqlalchemy', 'alembic', diff --git a/setup.py b/setup.py index 1030c6e3b..9ab4ecd0d 100755 --- a/setup.py +++ b/setup.py @@ -119,7 +119,6 @@ requires = [ 'chardet', 'lxml', 'Mako', - 'pymediainfo >= 2.2', 'PyQt5', 'QtAwesome', 'requests',