aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* setup.py/Windows: Add Clang to PATHFriedemann Kleint2017-05-191-1/+31
| | | | | | | | | | This removes the need for PATH to be added by COIN and makes provisioning easier. It should be revisited once Clang is shipped as 3rdparty library for Qt. Task-number: PYSIDE-431 Change-Id: I6868a2cfda4b519065c8db33e0779e6c48ba9fae Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-05-192-19/+53
|\ | | | | | | Change-Id: I551cb95411e934d2a9f2b747ca70cf9a063b65c1
| * Blacklist QML bug_951 and javascript_exceptions for Python3Friedemann Kleint2017-05-171-0/+4
| | | | | | | | | | | | | | | | | | bug_951 was enabled by 424652bf651ea2a5179e18e918ad6f63eb33fc81, but seems to failing with Python3. Task-number: PYSIDE-431 Change-Id: I38386810e469275e73f26448b71dd7cc68e586b5 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix Python libraries to be found for macOS Python 2.6 interpreterAlexandru Croitor2017-05-031-18/+40
| | | | | | | | | | Change-Id: I0dbd65a23bde599f923811c74d0565f329116c93 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix Python libraries to be found on OpenSuSE 13.01Alexandru Croitor2017-05-031-0/+2
| | | | | | | | | | Change-Id: I8bc9f18e5e85ff22ab4e6f24d9bf0917730b7a23 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix syntax error for format method on Python 2.6Alexandru Croitor2017-05-031-2/+2
| | | | | | | | | | Change-Id: I5f2ecb29ca904b6b5a011f461debda62f38dbdc2 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix CMake bug where incorrect CMAKE_OSX_SYSROOT was chosenAlexandru Croitor2017-04-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Apparently in earlier versions of CMake, if the OS version found in CMAKE_OSX_DEPLOYMENT_TARGET did not have a corresponding SDK with the same version in XCode, the CMake build would fail. Make sure to use the latest SDK available to XCode. Change-Id: Ie2317c1d285377b0cd5c7a75c94628b03aef557e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Fix popenasync.py for non-Ascii charactersChristian Tismer2017-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some windows guy had some files with funny characters in the file names. This caused a crash because no error handling was defined. The script then got very confused and ran even into code which was for linux, barfing about a missing fcntl module, and that created a total mess, because the guy installed some funny fcntl module and got even worse errors. The simple fix was to ignore the error, which made the guy very happy. Happened with python3 on windows. Python2 does not have this issue. I’m not sure if we should continue to use this module at all? Task-number: PYSIDE-497 Change-Id: I48099a135702225c12cf7d8e62f058c50f612e5f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-04-272-1/+365
|\| | | | | | | Change-Id: I81d33ae7f72265f152410ccfb55d11a7d34d8902
| * Prepare_coin_soures: Fix branch detectionSimo Fält2017-04-271-1/+1
| | | | | | | | | | Change-Id: Id9a183027a2d5ed379a125ab6630e27a1808cacd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Add script that generates missing bindings reportAlexandru Croitor2017-04-271-0/+364
| | | | | | | | | | | | Change-Id: Idc97bf2c9bc8169b0be5911dce7503bfd0249f3e Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-04-211-30/+34
|\| | | | | | | Change-Id: I722a7c48e44380241dc8f6b013830e07bb0438f5
| * setup.py: Wrap prepare_packages in try/exceptFriedemann Kleint2017-04-201-26/+30
| | | | | | | | | | | | | | | | Print a message mentioning the function as otherwise it is quite hard to figure out where failures come from. Change-Id: Ib007c666e0ef406261c80e317004d1e439cf0403 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * setup.py: Fix .pdb file namesFriedemann Kleint2017-04-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | Remove the python version suffix, fixing error error: [Errno 2] No such file or directory: 'pyside-setup56d\\testenv3d_build\\py3.5-qt5.6.3-64bit-debug/shiboken2/libshiboken/shiboken2-python3.5.pdb' when building Windows with debug. Change-Id: I4352e77d67732ea5f2a60766a47f0dfca163a9a5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add version 5.9 and make it defaultFriedemann Kleint2017-04-071-1/+8
| | | | | | | | | | Change-Id: Ie7814933cb257a0ce495ad40d98dcacec4b78903 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-04-071-0/+5
|\| | | | | | | Change-Id: Icda9c40a985ae1549d068ba1068bfbad4cc6e761
| * Blacklist tests to get COIN passingmaya2Friedemann Kleint2017-04-061-0/+5
| | | | | | | | | | | | | | Task-number: PYSIDE-431 Task-number: PYSIDE-452 Change-Id: I52519ccd9bb19448910a1741abee80fd3cbcc859 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Describe building with ClangFriedemann Kleint2017-04-061-0/+22
| | | | | | | | | | | | Task-number: PYSIDE-323 Change-Id: Ib901b04ba1510ee02028805a9fa0c619ced3002c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix README.mdFriedemann Kleint2017-04-061-26/+21
| | | | | | | | | | | | | | | | Fix formatting, remove unrelated links and add a link to the "Getting started" page of the Wiki. Change-Id: If6dcf40693dbaab7baf21d4b65c91f3cee4ebb94 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge branch '5.6' into devFriedemann Kleint2017-04-051-0/+7
|\| | | | | | | | | | | | | Drop the change changing the default version to 5.6 in setup.py. Change-Id: Ifafc76c36ad9170271d7ed9db9ab5303b4606242
| * Add version 5.6 and make it defaultFriedemann Kleint2017-04-051-1/+8
| | | | | | | | | | Change-Id: I323c5f69ee4ba1b1c04addd2eeb9a4a76b99a54c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix licensesFriedemann Kleint2017-04-058-39/+272
|/ | | | | | | | | | | | | | | | | | Fix license checker error messages when run in default mode (git ls-files in pyside-setup): Failed test '.../pyside-setup/header.LGPL re-defines a license of type LGPL originally defined in .../qtbase/header.LGPL' not ok 2 - docs/conf.py does not appear to contain a license header not ok 3 - docs/make.bat does not appear to contain a license header not ok 4 - ez_setup.py does not appear to contain a license header not ok 5 - popenasync.py does not appear to contain a license header not ok 7 - qtinfo.py does not appear to contain a license header not ok 11 - utils.py does not appear to contain a license header Task-number: PYSIDE-491 Change-Id: Ia10ff40ef39c64ac717f36ed073b1d1675a150d1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* testrunner.py: Add default value for blacklistFriedemann Kleint2017-03-291-1/+3
| | | | | | | Saves some typing and makes COIN integration easier. Change-Id: Ic7b302157dd5b53388ccc7b89f70db5635bb3ba8 Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Create a tracking branch for version unless it existsFriedemann Kleint2017-03-201-1/+11
| | | | | Change-Id: Ie7832668e0a4adf4dcbf78e49c2af4b65ebe5107 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Remove blacklisting of some tests affected by QTextStream failuresFriedemann Kleint2017-03-161-16/+0
| | | | | | Task-number: PYSIDE-332 Change-Id: If4330d9ffeb3bba0dc016f9ad5de18ef42fea273 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Fix output of testrunner.py and remove ’six’Christian Tismer2017-03-131-3/+3
| | | | | | | | | There is a small error that reports the wrong total number of changes. Furthermore, the dependency of the six modure could be removed by a single line. Change-Id: I510eab49ae3b9c5c36a7ae31a982334fda18567d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix prepare_coin_sources.py on winSimo Fält2017-03-101-2/+5
| | | | | | | | "run_process_output" tends to crash on win, so using standard subprocess.check_output instead. Change-Id: Ibb3cc200558175a25cb580ddc13e6c0e7fc918c4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* update: bring repositories back in syncChristian Tismer2017-02-152-21/+33
| | | | | | | From time to time, it is good to update the master project. Change-Id: I50c45caf7c37ebb4ea865b4e4f5896e5cd8915fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix testrunner command “getcwd”Christian Tismer2017-02-101-2/+2
| | | | | | | | | | | The testrunner.py script was generalisation to allow to select older build versions. (This feature is not ready and in most cases it makes only sense when comparing python 2 and 3.) I had a wrong argument in “getcwd”. Fixed. Change-Id: Ic948a5a6649535bd6ad3d23bbc846f03bde82de0 Reviewed-by: Simo Fält <simo.falt@qt.io>
* blacklist: static_metaobject_test.py worksChristian Tismer2017-02-081-4/+0
| | | | | | | | | | The blacklisted ‘static_metaobject_test’ suddenly works, when ’@Slot()’ is added. So we don’t need to blacklist it any longer. But we should find out, why the test didn’t work _before_ in the first place. Task-number: PYSIDE-315 Change-Id: I343f248dabf334df09948073028ff1cd7c72c8a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* blacklist: qstandarditemmodel_test.py worksChristian Tismer2017-02-081-4/+0
| | | | | | | | | The blacklisted ‘qstandarditemmodel_test’ works now. The path settings are weird during the tests, so that I had to find out how to find shiboken during testing. Now it works. Change-Id: Ib064e93bd8f78da74f2db01255eb1efcb3704a56 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Support python 3.6Christian Tismer2017-02-071-2/+3
| | | | | | | | The necessary support for python 3.6 is just changing the setup.py file. Task-number: PYSIDE-471 Change-Id: Id5c0ad67d1bb9d360f333a415bed65e62c30b53e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add explanatory comment to repository checkFriedemann Kleint2017-02-071-0/+1
| | | | | | | Amends change b97da3efa0462a4de6ae20904dde3843bc18bce2. Change-Id: I8a48aa0d313f370f3933ff699ec2ed347f760e8b Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Check whether files are present in a submoduleFriedemann Kleint2017-01-121-1/+1
| | | | | | | | | | Calling setup.py to initialize the submodules from scratch would fail complaining about the missing 'master' branch in 'wiki', since it assumed the submodules were initialized if the directory was present. Check the directory contents instead. Change-Id: I577a97d8cacf408f7caf52565e13e88815475a3b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* prepare_coin_sources: Use dev branch as a default branchSimo Fält2017-01-121-3/+10
| | | | | | | | Use dev branch if given --branch option contains not existing branch. Change-Id: I21b0a1b9007407f30f899091de5a859fac0059f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update blacklistFriedemann Kleint2017-01-041-26/+6
| | | | | | | | | Remove entries that show BPASS. Add QtQml::bug_451. Task-number: PYSIDE-431 Change-Id: I4520e0c061df34c5a4d5a644bd8dd50154ee5de2 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Initializing pyside submodules when building with Qt CISimo Fält2016-12-191-0/+127
| | | | | | | | | | | | To be able to test changes to pyside-setup submodules with Qt CI, we have to set-up the source package ourself. This script will do necessary changes to sources so that test is executed in proper context. Change-Id: I681be6b9d4a9d1fb100b1fb88ba5791f3f44200e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* Enable testrunner for other projectsChristian Tismer2016-12-151-35/+65
| | | | | | | | | | | | | | | | | | | | Testrunner did only run the pyside2 tests. This new version also allows to specify the projects “shiboken2” and “pyside2-tools”. Now multiple tests can be specified. Interesting: All shiboken2 tests succeed, all pyside2-tools tests fail. Update: the pyside-tools tests work too, but the setup does not work automatically, yet. A “make” must be run in the pyside2-tools directory, and “pyside2-rcc -o example_rc.py example.qrc” must be run in order to generate a resource file. The tests are run according to a list. The default is currently “—projects=shiboken2 pyside2”. Change-Id: I69f08402de0956098aaca5553f98ce50cbf6eae5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* testrunner.py: Use 'linux' as classifier instead of legacy 'linux2'Friedemann Kleint2016-12-132-24/+26
| | | | | | | | | Python 2.X returns 'linux2' as platform for compatibility reasons regardless of the kernel version whereas Python 3.3 onwards returns 'linux'. Fixes blacklisting to work with newer versions of Python. Change-Id: I1d3fd72feaa42bd5c89fa10a9a73474a92a6ab53 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Update the pyside-setup submodulesChristian Tismer2016-12-123-25/+21
| | | | | | | | | | From time to time, submodules need to be updated. Actually, I would even like to update the master module after every submodule checkin, but this seems to be not easy to do all the time. Change-Id: I52f266c58086186df05ddcc85085f35e2e28ead7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* testrunner.py: Allow character '-' in test namesFriedemann Kleint2016-11-291-2/+2
| | | | | | | | | | | | | | | The script was mistakenly reporting FAIL : QtCore::bug_PYSIDE() for FAIL : QtCore::bug_PYSIDE-164() Fix by extending the regular expression. Change-Id: Id6ca4c75489bd577e25723efd62840f714e67ae4 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Support multiple builds in testrunner.pyChristian Tismer2016-11-241-23/+51
| | | | | | | | | | | | | | | | | | The testrunner module allowed only the last build to be tested. This patch allows to specify an arbitrary test index. The default is -1, which gives the normal behavior. The argument ‘—buildno’ specifies which build is to be selected. Note that multiple builds with the same directory are not valid, because the latest entry always overwrites the older ones. But for different configurations this makes sense. The default runtime was set to 600 s. Change-Id: Ib5b33a09dc0af7e36230ca4eba3c21c8970d8212 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Set the minimum Python3 to 3.3Christian Tismer2016-11-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | This was not really set. The setup supported 3.2, the default was saying 3.4, and I have set it now to 3.3. Reason: Besides a sensible useful minimum version, Python 3.3.3 is the only currently working version, which allows for a debug python build on macOS. I need this for my debugging work, admittedly. So this change is really made to support PYSIDE-79. Victor Stinner has supplied a patch three years ago, see https://mail.python.org/pipermail/python-bugs-list/2013-July/209044.html Since then, the patch was not maintained, and the problem has crept into python, again. If I find some time for it, then I will fix it. Task-number: PYSIDE-79 Change-Id: I1b7d4ff1613d31567095636edc61f4222fad08dd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Accept more errors in "testrunner.py"Christian Tismer2016-11-032-26/+11
| | | | | | | | Testrunner has even more variable texts to recognize. We change the regex slightly so that it always succeeds. Change-Id: Iac156592aac48afb5aea522540ae63c92ca2572a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Remove QML tests from black listsAlexandru Croitor2016-10-211-60/+0
| | | | | Change-Id: Ia33affd98544e169ce63c0753429b6fc447822ff Reviewed-by: Christian Tismer <tismer@stackless.com>
* Make paths absolute in setup.pyChristian Tismer2016-10-182-2/+16
| | | | | | | | | | | | | | | The paths for "qmake" and "cmake" will not work when they are relative paths. This problem is pretty subtle, when setup.py breaks because it cannot create the simple list at line 712, variable "cmake_cmd". This innocent looking list is causing problems, because it uses qtinfo.py, and this is dependent on properties which call back into the subprocess module! The properties in qtinfo.py are now real properties, because their values are early computed in __init__. The problem is solved by this patch. Change-Id: I877b6644fa2909ca9ac1f23d4ce5accfc869716b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* setup: Add QT_SRC_DIR variableFriedemann Kleint2016-10-141-0/+10
| | | | | | | | | Presence of the variable enables the generation of the doc targets in PySide2. Task-number: PYSIDE-363 Change-Id: I0e1d4702da297f2390f09f9354c413da24febee1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add header for LGPLFriedemann Kleint2016-10-141-0/+39
| | | | | | | | | | | The header is required to satisfy the license checker when running against qtbase 5.6. The change might need to be reverted for 5.7 and higher. Task-number: PYSIDE-431 Change-Id: I1c662040a055c8451fdd66339cd8eb72594a198f Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Simo Fält <simo.falt@theqtcompany.com>
* Add licenses for submodulesFriedemann Kleint2016-10-149-0/+4333
| | | | | | Task-number: PYSIDE-431 Change-Id: Ic2fea5d524c6bee86eae4616968df5b2a5a6b942 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix licenses of setup.py testrunner.pyFriedemann Kleint2016-10-122-19/+77
| | | | | Change-Id: I049929e2c4e24554866000df5daa063071060884 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 18:35:38 +0000