aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts/config.py
Commit message (Collapse)AuthorAgeFilesLines
...
| * setup.py: Fix some flake8 warningsFriedemann Kleint2020-10-071-1/+0
| | | | | | | | | | | | | | Fix spaces around operators, missing lines, import order. Change-Id: I05ecafec849578fed6018654fcefaa008b6801e8 Reviewed-by: Cristian Maureira-Fredes <[email protected]>
* | Re-add missing toolsFriedemann Kleint2020-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | Bring back wrapper and tools from the sub-repo which was removed by 9c9b506f3b2cc64da6fbbef9f58ccec7ccfe4457. Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ib4f83721e4b56174109629dce64da56b9a71ffa5 Reviewed-by: Christian Tismer <[email protected]> Reviewed-by: Cristian Maureira-Fredes <[email protected]>
* | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-08-311-1/+2
|\| | | | | | | Change-Id: Icf4b3535be52b64ef15eced7103bb1280e031e30
| * support Python 3.9Christian Tismer2020-08-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | This was merged with "WIP: Enable support for Python 3.9". There were minor problems, only. Thanks Cristian for adding cosmetic changes which should already have been applied in Python 3.8 or earlier. Change-Id: Id5e8696d9cfb7192243ad44c93e9f2cf347d6a7c Reviewed-by: Cristian Maureira-Fredes <[email protected]>
* | Remove pyside-toolsFriedemann Kleint2020-07-031-1/+1
|/ | | | | | | Task-number: PYSIDE-1339 Task-number: PYSIDE-904 Change-Id: Ice3fbbf2a47833d8bb8702b4b553c87df2d9757d Reviewed-by: Christian Tismer <[email protected]>
* Update config.py to allow Python 3.8 in pipChristian Tismer2019-12-051-1/+1
| | | | | | | | | After Python 3.8 works with PySide, we can remove the restriction to Python 3.7 from "python_requires". Change-Id: I5be5364cda14c38aabc2bf579165efbb614969e0 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Cristian Maureira-Fredes <[email protected]>
* Improve code style with flake8Cristián Maureira-Fredes2019-11-251-1/+1
| | | | | | | | | | | | | | | | | - We agreed on 100 columns time ago, so I move around a few things, - Removing unused modules, - Fix white-spaces tabs without being multiple of 4, - Encourage the use of os.path.join when joining paths, - Using .format() for string formatting, - Remove white-spaces from default arguments, - Adjusting white-spaces before inline comments, - Adding extra newlines when expected, - Adjust spaces for lines under-indented for visual indent, - Remove white-spaces from parenthesis, and adding them for arithmetic operators. Change-Id: I9cb28cefd114d63580b584a063c452f90d3ca885 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Friedemann Kleint <[email protected]>
* Merge remote-tracking branch 'origin/5.13' into 5.14Friedemann Kleint2019-11-251-2/+2
|\ | | | | | | Change-Id: I4659f593110a3c8d3fb23a3110efc1668fe0bf28
| * Add python_requires to the python setupCristián Maureira-Fredes2019-11-181-2/+2
| | | | | | | | | | | | | | | | | | This will avoid the current option of installing 5.13.x wheels on Python 3.8 environments. Task-number: PYSIDE-1140 Change-Id: Ia5e1e77dd2e48807e2f485177c2821fba5c1c76b Reviewed-by: Friedemann Kleint <[email protected]>
* | Add designer to the pyside toolsCristián Maureira-Fredes2019-10-311-0/+1
| | | | | | | | | | | | | | Fixes: PYSIDE-1001 Fixes: PYSIDE-1068 Change-Id: I0969cd234331789b300c8dc521ab6bbf84004d1d Reviewed-by: Friedemann Kleint <[email protected]>
* | Replace pyside2 uic/rccCristián Maureira-Fredes2019-10-251-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the compatibility patches for uic and rcc, is now possible to generate Python code by using the option '-g python': uic -g python file.ui -o ui_file.py rcc -g python file.qrc -o rc_file.py This patch depends on many changes on the 'pyside2-tools' submodule, which mainly remove the old implementations of pyside2-uic and pyside2-rcc. The pyside_tool.py wrapper is now in charge of calling the uic and rcc binaries, with the -g python every time the pyside2-uic and pyside2-rcc binaries are called. To achieve this, we are now shipping the uic and rcc binaries from the Qt installation. Fixes: PYSIDE-1098 Change-Id: Ibdec0012f7ed671cd99424e1258c20649609c2da Reviewed-by: Friedemann Kleint <[email protected]>
* | Add support for Python 3.8Cristián Maureira-Fredes2019-10-241-0/+1
|/ | | | | Change-Id: I824085342694ac1cddc4db91dc6b95abdcc78122 Reviewed-by: Friedemann Kleint <[email protected]>
* Add Proprietary License to be show in metadataSimo Fält2019-08-261-0/+1
| | | | | | | | | | Adding Proprietary License to METADATA to indicate possibility for commercial licencing. License will be shown in pypi.org with LGPL possibility. Change-Id: Ic389adc2a867b9ea1118574fdf627e78acb02ba2 Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Cristian Maureira-Fredes <[email protected]>
* Add dependency version for shiboken2Cristian Maureira-Fredes2019-02-131-2/+2
| | | | | | | | | | | | | | | | | Since we specify: install_requires = ["shiboken2"] without a version, when trying to install: pip install PySide2==5.12.0 will install the latest shiboken version (5.12.1), and then of course there will be many issues related to the mismatch. This patch add the package_version to the shiboken2 dependency. Fixes: PYSIDE-929 Change-Id: I459cb22fc1506acfc861d33044bc3f7d2a85d85a Reviewed-by: Simo Fält <[email protected]>
* Fix shiboken description issueCristian Maureira-Fredes2019-02-011-2/+2
| | | | | | | | | | The comma at the end of the string generate an ugly tuple-like string on pypi. Change-Id: I3fb9b1d23fad939dc46c3e323dd95210eab8da2c Reviewed-by: Simo Fält <[email protected]> Reviewed-by: Friedemann Kleint <[email protected]> Reviewed-by: Christian Tismer <[email protected]>
* Fix wrong METADATA for generated wheelsCristian Maureira-Fredes2019-01-111-3/+2
| | | | | | | | | | | | | | | | | | | | | For the 5.12.0 release, we noticed that a couple of strings in the wheel METADATA were not properly formed. The first case was the type of the description content: 'text/markdown', got interpreted as a tuple ('text/markdown',), which was not recognize as a valid format. The second issue was the summary. It was a two-line string: ('Python bindings ... ', '....') which got wrongly parsed, and we ended up missing some title information, and even getting the parenthesis on the description. Change-Id: I2f3e8b23e3d9a39355e6eb30ab79f581bde33d30 Fixes: PYSIDE-874 Task-number: QTQAINFRA-2455 Reviewed-by: Friedemann Kleint <[email protected]>
* Make quiet builds really quietAlexandru Croitor2018-12-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change does a couple of things: - Sets the distutils / setuptools --verbose option to 0 - Sets the distutils / setuptools --quiet option to 1 - The options above end up calling distutils.log.set_verbosity(0) - Passes the QUIET_BUILD cmake option from setup.py to every CMake invocation, when --quiet is passed to setup.py - Sets the CMAKE_INSTALL_MESSAGE variable to silence messages regarding installation of files - Sets the CMAKE_RULE_MESSAGES variable to disable progress report in makefiles when building each source file - Overrides the CMake message function, not to display STATUS / info / untyped messages (still displays warnings and errors) - Changes the build / install elapsed time messages to always be printed even in quiet mode - Reverts the previously introduced set_quiet function in utils, because log.set_verbosity() now takes care of silencing those messages As a result, there's a lot less clutter when doing a quiet build. Warnings, errors and shiboken output is still displayed. Change-Id: Ie05c593ce7dc0aa04554c2d2859ce655233ddb9f Reviewed-by: Christian Tismer <[email protected]> Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Friedemann Kleint <[email protected]>
* Allow building shiboken2 and PySide2 as separate wheelsAlexandru Croitor2018-10-121-0/+393
Actually this creates 3 wheel packages: - shiboken2 (the python module and libshiboken shared library) - shiboken2-generator (contains the generator executable, libclang and dependent Qt libraries) - PySide2 (the PySide2 modules and Qt shared libraries, and tools like rcc, uic) Calling the setup.py script will not do the actual build now (in the sense of calling CMake, make, etc.). Instead it will spawn new processes (via subprocess.call) calling the same setup.py script, but with different arguments. These "sub-invocations" will do the actual building. Thus, the "top-level invocation" will decide which packages to build and delegate that to the "sub-invocations" of setup.py. A new optional command line argument is introduced called "--build-type" which defaults to "all", and can also be set to "shiboken2", "shiboken2-generator" and "pyside2". A user can choose which packages to build using this option. The "top-level invocation" uses this option to decide how many "sub-invocations" to execute. A new command line argument called "--internal-build-type" takes the same values as the one above. It defines which package will actually be built in the new spawned "sub-invocation" process. The "top-level invocation" sets this automatically for each "sub-invocation" depending on the value of "--build-type". This option is also useful for developers that may want to debug the python building code in the "sub-invocation". Developers can set this manually via the command line, and thus avoid the process spawning indirection. A new class Config is introduced to facilitate storage of the various state needed for building a single package. A new class SetupRunner is introduced that takes care of the "--build-type" and "--internal-build-type" argument handling and delegation of "sub-invocations". A new class Options is introduced to 'hopefully', in the future, streamline the mess of option handling that we currently have. setup.py now is now simplified to mostly just call SetupRunner.run_setup(). Certain refactorings were done to facilitate further clean-up of the build code, the current code is definitely not the end all be all. Various other changes that were needed to implement the wheel separation: - a new cmake_helpers directory is added to share common cmake code between packages. - the custom popenasync.py file is removed in favor of using subprocess.call in as many places as possible, and thus avoid 10 different functions for process creation. - Manifest.in is removed, because copying to the setuptools build dir is now done directly by prepare_packages functions. - because prepare_packages copies directly to the setuptools build dir, avoiding the pyside_package dir, we do less copying of big Qt files now. - versioning of PySide2 and shiboken2 packages is now separate. shiboken2 and shiboken2-generator share the same versions for now though. - shiboken2 is now listed as a required package for PySide2, to facilitate pip requirements.txt dependencies. - coin_build_instructions currently needs to install an unreleased version of wheel, due to a bug that breaks installation of generated wheel files. - added separate command line options to pyside2_config.py for shiboken2-module and shiboken2-generator. - adapted samplebinding and scriptableapplication projects due to shiboken being a separate package. - adapted pyside2-tool and shiboken2-tool python scripts for setup tools entry points. - made some optimizations not to invoke cmake for shiboken2-generator when doing a top-level "all" build. - fixed unnecessary rpaths not to be included on Linux (mainly the Qt rpaths). Task-nubmer: PYSIDE-749 Change-Id: I0336043955624c1d12ed254802c442608cced5fb Reviewed-by: Christian Tismer <[email protected]> Reviewed-by: Qt CI Bot <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-17 16:58:06 +0000