From 71ce95a0f06b3a6c457acc798cb5b213e87d3d126294367146fceda1805b5a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 21 Aug 2024 17:21:37 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-sip6 revision a3c6e4378b5705cb9b1ddfa78b39df5d --- python-sip6.changes | 21 ++++++++++ python-sip6.spec | 28 ++++++------- sip-6.7.12.tar.gz | 3 -- sip-6.8.2.tar.gz | 3 ++ support-python3.6.patch | 90 ----------------------------------------- 5 files changed, 36 insertions(+), 109 deletions(-) delete mode 100644 sip-6.7.12.tar.gz create mode 100644 sip-6.8.2.tar.gz delete mode 100644 support-python3.6.patch diff --git a/python-sip6.changes b/python-sip6.changes index 44f4842..976a2d0 100644 --- a/python-sip6.changes +++ b/python-sip6.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Jan 25 20:10:44 UTC 2024 - Ben Greiner + +- Update to 6.8.2 + * Added the --deprecations-are-errors command line option to all + build tools. + * All generated files are UTF-8 encoded. +- Release 6.8.1 + - Bug fixes. +- Release 6.8.0 + * Python v3.7 is no longer supported. + * The latest version of ABI v13 is v13.7.0. + * The latest version of ABI v12 is v12.14.0. + * Added support for specifying the project metadata using the + '[project]' section of pyproject.toml as defined in PEP 621. + The use of the '[tool.sip.metadata]' is now deprecated. + * The conversion to a pure Python implementation is now complete. +- Drop support-python3.6.patch + * python-foo prefixed packages for SLE15 with python3.6 should be + handled by an SLE internal maintenance request to python3-foo + ------------------------------------------------------------------- Sun Oct 15 13:42:16 UTC 2023 - Ben Greiner diff --git a/python-sip6.spec b/python-sip6.spec index 847d238..5c48e9b 100644 --- a/python-sip6.spec +++ b/python-sip6.spec @@ -1,7 +1,7 @@ # # spec file for package python-sip6 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,22 +18,22 @@ %{?sle15_python_module_pythons} Name: python-sip6 -Version: 6.7.12 +Version: 6.8.2 Release: 0 Summary: A Python bindings generator for C/C++ libraries License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP Group: Development/Libraries/Python URL: https://www.riverbankcomputing.com/software/sip Source0: https://files.pythonhosted.org/packages/source/s/sip/sip-%{version}.tar.gz -Patch0: support-python3.6.patch -BuildRequires: %{python_module devel >= 3.6} +BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module packaging} -BuildRequires: %{python_module ply} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module tomli if %python-base < 3.11} -BuildRequires: c++_compiler +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildArch: noarch %python_subpackages @@ -48,12 +48,8 @@ to generate wxPython, the Python bindings for wxWidgets. Summary: A Python bindings generator for C/C++ libraries Group: Development/Libraries/Python Requires: c++_compiler -Requires: python-devel >= 3.6 -%if %{python_version_nodots} <= 36 -Requires: python-dataclasses -%endif +Requires: python-base >= 3.8 Requires: python-packaging -Requires: python-ply Requires: python-setuptools Requires: (python-tomli if python-base < 3.11) Requires(post): update-alternatives @@ -95,17 +91,17 @@ This package contains the documentation and example files. %autosetup -p1 -n sip-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/sip-build %python_clone -a %{buildroot}%{_bindir}/sip-distinfo %python_clone -a %{buildroot}%{_bindir}/sip-install %python_clone -a %{buildroot}%{_bindir}/sip-module %python_clone -a %{buildroot}%{_bindir}/sip-sdist %python_clone -a %{buildroot}%{_bindir}/sip-wheel -%python_expand %fdupes %{buildroot}%{$python_sitearch} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %fdupes -s doc %post devel @@ -122,8 +118,8 @@ This package contains the documentation and example files. %python_alternative %{_bindir}/sip-module %python_alternative %{_bindir}/sip-sdist %python_alternative %{_bindir}/sip-wheel -%{python_sitearch}/sipbuild -%{python_sitearch}/sip-%{version}*-info +%{python_sitelib}/sipbuild +%{python_sitelib}/sip-%{version}.dist-info %if 0%{?suse_version} > 1500 %files -n python-sip6-doc diff --git a/sip-6.7.12.tar.gz b/sip-6.7.12.tar.gz deleted file mode 100644 index 1d353e6..0000000 --- a/sip-6.7.12.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08e66f742592eb818ac8fda4173e2ed64c9f2d40b70bee11db1c499127d98450 -size 1169656 diff --git a/sip-6.8.2.tar.gz b/sip-6.8.2.tar.gz new file mode 100644 index 0000000..23634ed --- /dev/null +++ b/sip-6.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e65a423037422ccfde095c257703a8ff45cc1c89bdaa294d7819bc836c87639 +size 987521 diff --git a/support-python3.6.patch b/support-python3.6.patch deleted file mode 100644 index c06f767..0000000 --- a/support-python3.6.patch +++ /dev/null @@ -1,90 +0,0 @@ -Index: sip-6.7.12/PKG-INFO -=================================================================== ---- sip-6.7.12.orig/PKG-INFO -+++ sip-6.7.12/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: sip-6.7.12/setup.py -=================================================================== ---- sip-6.7.12.orig/setup.py -+++ sip-6.7.12/setup.py -@@ -50,7 +50,7 @@ setup( - name='sip', - version=version, - license='SIP', -- python_requires='>=3.7', -+ python_requires='>=3.6', - install_requires=['packaging', 'ply', 'setuptools', - 'tomli;python_version<"3.11"'], - packages=find_packages(), -Index: sip-6.7.12/sipbuild/py_versions.py -=================================================================== ---- sip-6.7.12.orig/sipbuild/py_versions.py -+++ sip-6.7.12/sipbuild/py_versions.py -@@ -22,4 +22,4 @@ - - - # The oldest supported minor version of Python v3. --OLDEST_SUPPORTED_MINOR = 7 -+OLDEST_SUPPORTED_MINOR = 6 -Index: sip-6.7.12/sipbuild/module/source/12/setup.py.in -=================================================================== ---- sip-6.7.12.orig/sipbuild/module/source/12/setup.py.in -+++ sip-6.7.12/sipbuild/module/source/12/setup.py.in -@@ -40,6 +40,6 @@ setup( - name='@SIP_MODULE_PROJECT_NAME@', - version='@SIP_MODULE_VERSION@', - license='SIP', -- python_requires='>=3.7', -+ python_requires='>=3.6', - ext_modules=[module] - ) -Index: sip-6.7.12/sipbuild/module/source/12/sip.h.in -=================================================================== ---- sip-6.7.12.orig/sipbuild/module/source/12/sip.h.in -+++ sip-6.7.12/sipbuild/module/source/12/sip.h.in -@@ -24,8 +24,8 @@ - #include - - /* Sanity check on the Python version. */ --#if PY_VERSION_HEX < 0x03070000 --#error "This version of @_SIP_MODULE_FQ_NAME@ requires Python v3.7 or later" -+#if PY_VERSION_HEX < 0x03060000 -+#error "This version of @_SIP_MODULE_FQ_NAME@ requires Python v3.6 or later" - #endif - - -Index: sip-6.7.12/sipbuild/module/source/13/setup.py.in -=================================================================== ---- sip-6.7.12.orig/sipbuild/module/source/13/setup.py.in -+++ sip-6.7.12/sipbuild/module/source/13/setup.py.in -@@ -40,6 +40,6 @@ setup( - name='@SIP_MODULE_PROJECT_NAME@', - version='@SIP_MODULE_VERSION@', - license='SIP', -- python_requires='>=3.7', -+ python_requires='>=3.6', - ext_modules=[module] - ) -Index: sip-6.7.12/sipbuild/module/source/13/sip.h.in -=================================================================== ---- sip-6.7.12.orig/sipbuild/module/source/13/sip.h.in -+++ sip-6.7.12/sipbuild/module/source/13/sip.h.in -@@ -24,8 +24,8 @@ - #include - - /* Sanity check on the Python version. */ --#if PY_VERSION_HEX < 0x03070000 --#error "This version of @_SIP_MODULE_FQ_NAME@ requires Python v3.7 or later" -+#if PY_VERSION_HEX < 0x03060000 -+#error "This version of @_SIP_MODULE_FQ_NAME@ requires Python v3.6 or later" - #endif - -