Fixed travis archive name, and now not embedding qt in pyqt anymore, …

…this was not a good idea.

.travis.yml

@@ -93,16 +93,17 @@ after_success:
   # PyQt sources+binaries
   - echo "Creating PyQt+src archive" ;
     export PYQT_SUF=_gpl_%SUF% ;
-    sudo tar czvf ${TRAVIS_BUILD_DIR}/dist/PyQt${PYQT_VER}_gpl_${SUF}-with_src.tar.gz PyQt${PYQT_VER}-with_src >/dev/null
+    sudo tar czvf ${TRAVIS_BUILD_DIR}/dist/PyQt${PYQT_VER}_gpl_py${TRAVIS_PYTHON_VERSION}_${SUF}-with_src.tar.gz PyQt${PYQT_VER}-with_src >/dev/null
 
   # PyQt binaries only (note: we do not include the lib*.so since they dont seem to be needed, they are not copied by the standard pyqt installer)
   - echo "Creating PyQt archive" ;
     mkdir ${PYQT_DIST_DIR} ;
     cd ${PYQT_DIR} ;
     echo "copy all interesting files *.so *.pyi *.pyd"; find . \( -name "*so" -o -name "*pyi" -o -name "*pyd" \) -not -name "lib*" -exec cp {} ${PYQT_DIST_DIR} \; ;
-    echo "copy __init__.py"; cp ./__init__.py ${PYQT_DIST_DIR};
-    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};
+    echo "copy __init__.py"; cp ./__init__.py ${PYQT_DIST_DIR}
+  # 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
 
   - ls dist

appveyor.yml

@@ -94,7 +94,11 @@ after_test:
     # the for loop seems to include the following lines when this is all in the same command. Splitting.
   - echo "copy all interesting files *.pyi *.pyd" & for /r %%i in (*pyi *pyd) do xcopy /Y "%%i" "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%"
   - echo "copy __init__.py" & xcopy /Y .\__init__.py "%APPVEYOR_BUILD_FOLDER%/%PYQT_DIST_REL%"
-  - 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%"
+  # this was a bad idea, cx freeze is able to better handle the qt dependency (and the platforms plugins) when qt is on the PATH.
+  # 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 "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