From ae8fcd8cb84782ffb14d7ef6910e0781b8250aa9 Mon Sep 17 00:00:00 2001 From: Sylvain Marie Date: Tue, 17 Oct 2017 18:59:54 +0200 Subject: [PATCH] On windows (appveyor), removed Qt platform copy, it was not good. On travis, fixed an error inside the PyQt package binary archive --- .travis.yml | 2 +- appveyor.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2eb9ad..914184d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,7 +106,7 @@ after_success: # this was a bad idea we should let the users handle the qt installation + addition to path themselves. # echo "copy qt files inside pyqt5"; cd ${TRAVIS_BUILD_DIR}/${QT_DIR}/lib ; find . \( -name "*Core.so*" -o -name "*Gui.so*" -o -name "*Widgets.so*" \) -exec cp {} ${PYQT_DIST_DIR} \; ; - echo "finally create the archive"; cd ${TRAVIS_BUILD_DIR}; - sudo tar czvf ${TRAVIS_BUILD_DIR}/dist/PyQt${PYQT_VER}_gpl_py${TRAVIS_PYTHON_VERSION}_${SUF}.tar.gz PyQt${PYQT_VER} >/dev/null + sudo tar czvf ${TRAVIS_BUILD_DIR}/dist/PyQt${PYQT_VER}_gpl_py${TRAVIS_PYTHON_VERSION}_${SUF}.tar.gz PyQt5 >/dev/null - ls dist # diff --git a/appveyor.yml b/appveyor.yml index 3baf7d3..b72ea0f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -99,7 +99,9 @@ after_test: # besides there are also the msys2 dependencies to install. # If one day we want to be able to ship like 'conda install' then we will need to recompilet against MSVC and to ship also a Qt wheel (see conda) #- echo "copy qt files inside pyqt5" & cd %APPVEYOR_BUILD_FOLDER%/%QT_DIR_REL%/bin & for /r %%i in (*Core.dll *Gui.dll *Widgets.dll) do xcopy /Y "%%i" "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%" - - echo "copy qt platform file inside pyqt5" & mkdir "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%/platforms" & xcopy %APPVEYOR_BUILD_FOLDER%/%QT_DIR_REL%/plugins/platforms/qwindows.dll "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%/platforms" +# - echo "copy qt platform file inside pyqt5" +# - mkdir "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%/platforms" +# - xcopy "%APPVEYOR_BUILD_FOLDER%/%QT_DIR_REL%/plugins/platforms/qwindows.dll" "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%/platforms" - echo "finally create the archive" & cd %APPVEYOR_BUILD_FOLDER% & 7z a -ttar -so PyQt%PYQT_VER%_gpl_py%PYTHON_VERSION%_%SUF%.tar %PYQT_DIST_REL% | 7z a -si dist/PyQt%PYQT_VER%_gpl_py%PYTHON_VERSION%_%SUF%.tar.gz