diff --git a/.appveyor.yml b/.appveyor.yml index eb1ac1e..7f53c6d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,9 +9,7 @@ init: - set PATH=C:\Miniconda;C:\Miniconda\Scripts;C:\Program Files (x86)\NSIS;%PATH% - conda create -n syncplay -y - activate syncplay - - conda install python=2.7.13 -y - - conda install pywin32 -y - - conda install -c conda-forge pyside2 -y + - conda install python pywin32 pyside -y - pip install twisted py2exe_py2 zope.interface - type nul > C:\Miniconda\envs\syncplay\lib\site-packages\zope\__init__.py - pip freeze @@ -21,12 +19,7 @@ install: - cd %APPVEYOR_BUILD_FOLDER% - for /F "tokens=2 delims='" %%a in ('findstr version syncplay\__init__.py') do @set ver=%%a - python buildPy2exe.py - - del syncplay_v%ver%\lib\api-* - - del syncplay_v%ver%\lib\DNSAPI.dll - - del syncplay_v%ver%\lib\IPHLPAPI.dll - del syncplay_v%ver%\lib\MPR.dll - - mkdir syncplay_v%ver%\platforms - - copy C:\Miniconda\envs\syncplay\library\plugins\platforms\qwindows.dll syncplay_v%ver%\platforms\ - type nul > syncplay_v%ver%\syncplay.ini - copy resources\win_lua_note.txt syncplay_v%ver%\"VLC LUA Script installation.txt" diff --git a/buildPy2exe.py b/buildPy2exe.py index 881667c..310f765 100755 --- a/buildPy2exe.py +++ b/buildPy2exe.py @@ -720,8 +720,8 @@ info = dict( # console=['syncplayServer.py', {"script":"syncplayClient.py", "icon_resources":[(1, "resources\\icon.ico")], 'dest_base': "Syncplay"}], options={'py2exe': { 'dist_dir': OUT_DIR, - 'packages': 'PySide2.QtUiTools', - 'includes': 'twisted, sys, encodings, datetime, os, time, math, PySide2, liburl, ast, unicodedata, _ssl', + 'packages': 'PySide.QtUiTools', + 'includes': 'twisted, sys, encodings, datetime, os, time, math, PySide, liburl, ast, unicodedata', 'excludes': 'venv, doctest, pdb, unittest, win32clipboard, win32file, win32pdh, win32security, win32trace, win32ui, winxpgui, win32pipe, win32process, Tkinter', 'dll_excludes': 'msvcr71.dll, MSVCP90.dll, POWRPROF.dll', 'optimize': 2, @@ -733,5 +733,5 @@ info = dict( cmdclass = {"py2exe": build_installer}, ) -sys.argv.extend(['py2exe', '-p win32com ', '-i twisted.web.resource', '-i PySide2.QtCore', '-p PySide2.QtGui', '-i PySide2.QtWidgets']) +sys.argv.extend(['py2exe', '-p win32com ', '-i twisted.web.resource', '-p PySide.QtGui']) setup(**info)