From b19da337284335708573ade22f55b3f5175f17674e58db69cc5e01643879fb3f Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 9 Apr 2024 09:58:31 +0000 Subject: [PATCH] Accepting request 1166354 from home:bnavigator:branches:KDE:Qt:PyQt - Update to 1.16.0 * The project repository has been migrated to GitHub. * PyQt-builder is now licensed under the BSD-2-Clause license. * The project has now been migrated from setup.py to setuptools_scm and pyproject.toml. * The documentation is now hosted at Read the Docs. * The QtQuickPhysics libraries added to Qt v6.6.0 are now bundled. * The QtQuickControls2 style libraries added to Qt v6.6.3 are now bundled. * The example in the documentation no longer uses deprecated features that will be removed in SIP v7. * The example is now PyQt6-based rather than PyQt5. * The default ABI versions are now v12.13 and v13.6. OBS-URL: https://build.opensuse.org/request/show/1166354 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-pyqt-builder?expand=0&rev=23 --- LICENSE | 22 ++++++++++++++ PyQt-builder-1.15.4.tar.gz | 3 -- PyQt-builder-1.16.0.tar.gz | 3 ++ python-pyqt-builder.changes | 18 +++++++++++ python-pyqt-builder.spec | 15 ++++++---- support-python3.6.patch | 59 +++++++++++++++---------------------- 6 files changed, 75 insertions(+), 45 deletions(-) create mode 100644 LICENSE delete mode 100644 PyQt-builder-1.15.4.tar.gz create mode 100644 PyQt-builder-1.16.0.tar.gz diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..daf12b5 --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +Copyright 2024 Phil Thompson + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation +and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/PyQt-builder-1.15.4.tar.gz b/PyQt-builder-1.15.4.tar.gz deleted file mode 100644 index 0ea364c..0000000 --- a/PyQt-builder-1.15.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39f8c75db17d9ce17cb6bbf3df1650b5cebc1ea4e5bd73843d21cc96612b2ae1 -size 3766458 diff --git a/PyQt-builder-1.16.0.tar.gz b/PyQt-builder-1.16.0.tar.gz new file mode 100644 index 0000000..cf4f1ed --- /dev/null +++ b/PyQt-builder-1.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47bbd2cfa5430020108f9f40301e166cbea98b6ef3e53953350bdd4c6b31ab18 +size 3670068 diff --git a/python-pyqt-builder.changes b/python-pyqt-builder.changes index 5b0b37e..67a9149 100644 --- a/python-pyqt-builder.changes +++ b/python-pyqt-builder.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Apr 9 07:36:05 UTC 2024 - Ben Greiner + +- Update to 1.16.0 + * The project repository has been migrated to GitHub. + * PyQt-builder is now licensed under the BSD-2-Clause license. + * The project has now been migrated from setup.py to + setuptools_scm and pyproject.toml. + * The documentation is now hosted at Read the Docs. + * The QtQuickPhysics libraries added to Qt v6.6.0 are now + bundled. + * The QtQuickControls2 style libraries added to Qt v6.6.3 are + now bundled. + * The example in the documentation no longer uses deprecated + features that will be removed in SIP v7. + * The example is now PyQt6-based rather than PyQt5. + * The default ABI versions are now v12.13 and v13.6. + ------------------------------------------------------------------- Thu Jan 25 20:05:00 UTC 2024 - Ben Greiner diff --git a/python-pyqt-builder.spec b/python-pyqt-builder.spec index 287d988..74b473b 100644 --- a/python-pyqt-builder.spec +++ b/python-pyqt-builder.spec @@ -19,17 +19,20 @@ %define mname pyqt-builder %{?sle15_python_module_pythons} Name: python-%{mname} -Version: 1.15.4 +Version: 1.16.0 Release: 0 Summary: The PEP 517 compliant PyQt build system -License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP -URL: https://www.riverbankcomputing.com/software/pyqt-builder +License: BSD-2-Clause +URL: https://github.com/Python-PyQt/PyQt-builder Source0: https://files.pythonhosted.org/packages/source/P/PyQt-builder/PyQt-builder-%{version}.tar.gz +# https://github.com/Python-PyQt/PyQt-builder/issues/7 +Source1: https://github.com/Python-PyQt/PyQt-builder/raw/4763ecdaf4fd799336948367701818528859c3d5/LICENSE # PATCH-FEATURE-SUSE support-python3.6.patch alarrosa@suse.com -- The PyQt5 packages have the SLE15 python module macro, but it is disable in some maintance projects Patch0: support-python3.6.patch BuildRequires: %{python_module base >= 3.6} BuildRequires: %{python_module pip} -BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module setuptools >= 64} +BuildRequires: %{python_module setuptools_scm >= 8} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -56,6 +59,7 @@ sip-install or pip can then be used to build and install the project. %prep %autosetup -p1 -n PyQt-builder-%{version} +cp %{SOURCE1} ./ %build %pyproject_wheel @@ -81,8 +85,7 @@ $python -c 'import pyqtbuild' %python_uninstall_alternative pyqt-bundle %files %{python_files} -%license LICENSE* -%doc README NEWS ChangeLog +%doc README.md LICENSE %python_alternative %{_bindir}/pyqt-bundle %python_alternative %{_bindir}/pyqt-qt-wheel %{python_sitelib}/pyqtbuild diff --git a/support-python3.6.patch b/support-python3.6.patch index 8d34d27..2fbd99d 100644 --- a/support-python3.6.patch +++ b/support-python3.6.patch @@ -1,39 +1,26 @@ -Index: PyQt-builder-1.15.4/PKG-INFO +Index: PyQt-builder-1.16.0/PKG-INFO =================================================================== ---- PyQt-builder-1.15.4.orig/PKG-INFO -+++ PyQt-builder-1.15.4/PKG-INFO -@@ -9,7 +9,7 @@ License: SIP - Platform: X11 - Platform: macOS - Platform: Windows --Requires-Python: >=3.7 +--- PyQt-builder-1.16.0.orig/PKG-INFO ++++ PyQt-builder-1.16.0/PKG-INFO +@@ -5,7 +5,7 @@ Summary: The PyQt build system + Author-email: Phil Thompson + Project-URL: homepage, https://github.com/Python-PyQt/PyQt-builder + Classifier: License :: OSI Approved :: BSD License +-Requires-Python: >=3.8 +Requires-Python: >=3.6 - License-File: LICENSE - License-File: LICENSE-GPL2 - License-File: LICENSE-GPL3 -Index: PyQt-builder-1.15.4/PyQt_builder.egg-info/PKG-INFO + Description-Content-Type: text/markdown + Requires-Dist: packaging + Requires-Dist: sip<7,>=6.7 +Index: PyQt-builder-1.16.0/pyproject.toml =================================================================== ---- PyQt-builder-1.15.4.orig/PyQt_builder.egg-info/PKG-INFO -+++ PyQt-builder-1.15.4/PyQt_builder.egg-info/PKG-INFO -@@ -9,7 +9,7 @@ License: SIP - Platform: X11 - Platform: macOS - Platform: Windows --Requires-Python: >=3.7 -+Requires-Python: >=3.6 - License-File: LICENSE - License-File: LICENSE-GPL2 - License-File: LICENSE-GPL3 -Index: PyQt-builder-1.15.4/setup.py -=================================================================== ---- PyQt-builder-1.15.4.orig/setup.py -+++ PyQt-builder-1.15.4/setup.py -@@ -48,7 +48,7 @@ setup( - name='PyQt-builder', - version=version, - license='SIP', -- python_requires='>=3.7', -+ python_requires='>=3.6', - install_requires=['packaging', 'sip >=6.7, <7'], - packages=find_packages(), - package_data={ +--- PyQt-builder-1.16.0.orig/pyproject.toml ++++ PyQt-builder-1.16.0/pyproject.toml +@@ -13,7 +13,7 @@ description = "The PyQt build system" + readme = "README.md" + urls.homepage = "https://github.com/Python-PyQt/PyQt-builder" + dependencies = ["packaging", "sip >=6.7, <7"] +-requires-python = ">=3.8" ++requires-python = ">=3.6" + classifiers = ["License :: OSI Approved :: BSD License"] + dynamic = ["version"] +