diff options
| author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2024-01-17 14:29:45 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2024-01-23 12:52:12 +0000 |
| commit | db554a0cb574ddbb2bb27de7649976bcaa85cdfe (patch) | |
| tree | 836f4f049c9e9feb0fc59e42b474b815d1ae8c45 /wheel_artifacts | |
| parent | 555567fb9a0c50df0e4684f52c2f6eb936fef4f3 (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
Pick-to: 6.6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'wheel_artifacts')
| -rw-r--r-- | wheel_artifacts/pyproject.toml.base | 5 | ||||
| -rw-r--r-- | wheel_artifacts/setup.py.base | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/wheel_artifacts/pyproject.toml.base b/wheel_artifacts/pyproject.toml.base index 22da9c895..28ca43b8e 100644 --- a/wheel_artifacts/pyproject.toml.base +++ b/wheel_artifacts/pyproject.toml.base @@ -50,12 +50,11 @@ Repository = "https://code.qt.io/cgit/pyside/pyside-setup.git/" Changelog = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/doc/changelogs" Tracker = "https://bugreports.qt.io/projects/PYSIDE" +PROJECT_SCRIPTS + [tool.distutils.bdist_wheel] py_limited_api = "cp38" plat_name = PROJECT_TAG -[tool.setuptools.packages] -find = {} - [tool.setuptools.dynamic] version = {attr = PROJECT_VERSION} diff --git a/wheel_artifacts/setup.py.base b/wheel_artifacts/setup.py.base index e22298b99..9de30af5f 100644 --- a/wheel_artifacts/setup.py.base +++ b/wheel_artifacts/setup.py.base @@ -20,7 +20,6 @@ class build_ext(Command): setup_args = dict( include_package_data=True, packages = ["{name}"], - entry_points = {console_scripts}, ext_modules = [Extension("{fake_ext}", [], py_limited_api=True)], install_requires={install}, cmdclass=dict([("build_ext", build_ext)]), |