diff options
author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2024-01-17 14:29:45 +0100 |
---|---|---|
committer | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2024-01-25 22:16:04 +0100 |
commit | b9fab30122b0e6f61792bea6092143094d5cf8c6 (patch) | |
tree | 99e5fda8cc2923f1655f31beed31c48f2efd63e4 /testing | |
parent | b0a7a3666f95e1424930c12eb939a1fee3c003b9 (diff) |
build: update dependencies and process
Even though some packages are 'safer' to update,
we cannot rely on having the CI discovering it on
random integrations. Pinning the remaining packages
and ordering them a bit.
The update of the 'build' package (to create wheels)
required the replacement of 'build.pep517' by
the new 'pyproject_hooks' module, and other
modification to the wheel artifacts.
The removed dependencies are currently placed at the tool level
requirements.txt so it's not like they are not needed anymore.
Test and CI scripts were adapted in order to rely on the 'dist'
directory rather than the 'dist_new' one, removing the old
step of creating the wheels with 'setup.py bdist_wheel'.
The entry points (console scripts) that we used to have
in the 'setup.py' were moved to the 'pyproject.toml' in order
to advance towards not relying on the setup.py file.
Flake8 issues were addressed in the different files
that this patch modified.
Change-Id: I83480c1920206e11fcb9a45264b6beaf6f8b686b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit db554a0cb574ddbb2bb27de7649976bcaa85cdfe)
Diffstat (limited to 'testing')
-rw-r--r-- | testing/wheel_tester.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/testing/wheel_tester.py b/testing/wheel_tester.py index 70c43313d..24bc890bc 100644 --- a/testing/wheel_tester.py +++ b/testing/wheel_tester.py @@ -35,9 +35,9 @@ this_dir = os.path.dirname(this_file) setup_script_dir = os.path.abspath(os.path.join(this_dir, "..")) sys.path.append(setup_script_dir) -from build_scripts.utils import (find_files_using_glob, find_glob_in_path, +from build_scripts.utils import (find_files_using_glob, find_glob_in_path, # noqa: E402 remove_tree, run_process, run_process_output) -from build_scripts.log import log +from build_scripts.log import log # noqa: E402 log.setLevel(logging.DEBUG) @@ -83,7 +83,8 @@ def package_prefix_names(): # Note: shiboken6_generator is not needed for compile_using_nuitka, # but building modules with cmake needs it. if NEW_WHEELS: - return ["shiboken6", "shiboken6_generator", "PySide6_Essentials", "PySide6_Addons", "PySide6"] + return ["shiboken6", "shiboken6_generator", "PySide6_Essentials", "PySide6_Addons", + "PySide6"] else: return ["shiboken6", "shiboken6_generator", "PySide6"] @@ -360,7 +361,7 @@ def try_build_examples(): for modname in modules: # PYSIDE-1735: pyi files are no longer compatible with Python. # XXX Maybe add a test with Mypy here? - pass # execute_script(src_path / f"{modname}.pyi") + pass # execute_script(src_path / f"{modname}.pyi") def run_wheel_tests(install_wheels, wheels_dir_name): @@ -392,7 +393,8 @@ if __name__ == "__main__": ) parser.add_argument("--qmake", type=str, help="Path to qmake") parser.add_argument("--cmake", type=str, help="Path to cmake") - parser.add_argument("--wheels-dir", type=str, help="Path to where the wheels are", default="dist") + parser.add_argument("--wheels-dir", type=str, help="Path to where the wheels are", + default="dist") parser.add_argument("--new", action="store_true", help="Option to test new wheels") options = parser.parse_args() QMAKE_PATH = find_executable("qmake", options.qmake) |