Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-mypy for openSUSE:Factory
checked in at 2025-05-06 16:40:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-mypy (Old)
and /work/SRC/openSUSE:Factory/.python-mypy.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-mypy"
Tue May 6 16:40:12 2025 rev:12 rq:1274642 version:1.14.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-mypy/python-mypy.changes 2025-01-28
14:58:02.927246194 +0100
+++ /work/SRC/openSUSE:Factory/.python-mypy.new.30101/python-mypy.changes
2025-05-06 16:40:12.785119703 +0200
@@ -1,0 +2,11 @@
+Mon May 5 13:29:04 UTC 2025 - Friedrich Haubensak <hs...@mail.de>
+
+- Add mypy-1.14.1-gcc15.patch from upstream to fix gcc15 compile
+ time error
+
+-------------------------------------------------------------------
+Mon May 5 12:58:47 UTC 2025 - Matej Cepl <mc...@cepl.eu>
+
+- Update vendored types_* to the appropriate versions.
+
+-------------------------------------------------------------------
Old:
----
types-psutil-6.0.0.20241011.tar.gz
types-setuptools-75.1.0.20241014.tar.gz
New:
----
mypy-1.14.1-gcc15.patch
types_psutil-7.0.0.20250401.tar.gz
types_setuptools-78.1.0.20250329.tar.gz
BETA DEBUG BEGIN:
New:
- Add mypy-1.14.1-gcc15.patch from upstream to fix gcc15 compile
time error
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-mypy.spec ++++++
--- /var/tmp/diff_new_pack.qxGadH/_old 2025-05-06 16:40:13.641155479 +0200
+++ /var/tmp/diff_new_pack.qxGadH/_new 2025-05-06 16:40:13.641155479 +0200
@@ -16,10 +16,10 @@
#
-%{?sle15_python_module_pythons}
+%define types_psutil_version 7.0.0.20250401
+%define types_setuptools_version 78.1.0.20250329
%bcond_without test
-%define types_psutil_version 6.0.0.20241011
-%define types_setuptools_version 75.1.0.20241014
+%{?sle15_python_module_pythons}
Name: python-mypy
Version: 1.14.1
Release: 0
@@ -29,10 +29,12 @@
Source0:
https://files.pythonhosted.org/packages/source/m/mypy/mypy-%{version}.tar.gz
# Source0: mypy-%%{version}.tar.gz
# License Source1: Apache-2.0. Only for the test suite, not packaged here.
-Source1:
https://files.pythonhosted.org/packages/source/t/types-psutil/types-psutil-%{types_psutil_version}.tar.gz
+Source1:
https://files.pythonhosted.org/packages/source/t/types_psutil/types_psutil-%{types_psutil_version}.tar.gz
# License Source2: Apache-2.0. Only for the test suite, not packaged here.
-Source2:
https://files.pythonhosted.org/packages/source/t/types-setuptools/types-setuptools-%{types_setuptools_version}.tar.gz
+Source2:
https://files.pythonhosted.org/packages/source/t/types_setuptools/types_setuptools-%{types_setuptools_version}.tar.gz
Source99: python-mypy-rpmlintrc
+# PATCH-FIX-UPSTREAM
+Patch1: mypy-1.14.1-gcc15.patch
BuildRequires: %{python_module exceptiongroup}
BuildRequires: %{python_module mypy_extensions >= 1.0.0}
BuildRequires: %{python_module pip}
@@ -40,20 +42,19 @@
BuildRequires: %{python_module tomli >= 1.1.0}
BuildRequires: %{python_module typing_extensions >= 4.6.0}
BuildRequires: %{python_module wheel}
-BuildRequires: %{python_module wheel}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-mypy_extensions >= 0.4.3
Requires: python-typing_extensions >= 3.10
Requires: (python-tomli >= 1.1.0 if python-base < 3.11)
Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
+Suggests: python-psutil >= 4.0
+BuildArch: noarch
%if "%{python_flavor}" == "python3" || "%{?python_provides}" == "python3"
Provides: mypy = %{version}
Obsoletes: mypy < %{version}
%endif
-Suggests: python-psutil >= 4.0
-BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module attrs >= 18}
BuildRequires: %{python_module devel}
@@ -85,15 +86,16 @@
and union types.
%prep
-%setup -q -a 1 -a 2 -n mypy-%{version}
+%setup -q -a1 -n mypy-%{version}
+%setup -q -T -D -a2 -n mypy-%{version}
%autopatch -p1
sed -i '/env python3/d' ./mypy/stubgenc.py
sed -i '/env python3/d' ./mypy/stubgen.py
mkdir mystubs
-mv types-setuptools-%{types_setuptools_version}/setuptools-stubs* mystubs/
-mv types-psutil-%{types_psutil_version}/psutil-stubs* mystubs/
+mv types_setuptools-%{types_setuptools_version}/setuptools-stubs* mystubs/
+mv types_psutil-%{types_psutil_version}/psutil-stubs* mystubs/
# "E: wrong-script-end-of-line-encoding" and "E: spurious-executable-perm",
file is not needed anyways
rm docs/make.bat
@@ -153,7 +155,7 @@
%license LICENSE
%{python_sitelib}/mypy
%{python_sitelib}/mypyc
-# %{python_sitelib}/mypy-%%{version}.dist-info
+# %%{python_sitelib}/mypy-%%{version}.dist-info
%{python_sitelib}/mypy-*.dist-info
%python_alternative %{_bindir}/dmypy
%python_alternative %{_bindir}/mypy
++++++ mypy-1.14.1-gcc15.patch ++++++
github.com/python/mypy/issues/18698
github.com/python/mypy/pull/18699
github.com/python/mypy/commit/0808624
>From 0808624c67331f52c2d503ad8afe4f1087b0371c Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <1330696+m...@users.noreply.github.com>
Date: Tue, 18 Feb 2025 00:45:37 +0100
Subject: [PATCH] pythoncapi_compat: don't define Py_NULL if it is already
defined (#18699)
Fixes: #18698
This is a naive fix for the gcc 15 error when compiling for Python 3.12
---
mypyc/lib-rt/pythoncapi_compat.h | 2 ++
1 file changed, 2 insertions(+)
Index: mypy-1.14.1/mypyc/lib-rt/pythoncapi_compat.h
===================================================================
--- mypy-1.14.1.orig/mypyc/lib-rt/pythoncapi_compat.h 2024-12-30
15:26:58.000000000 +0100
+++ mypy-1.14.1/mypyc/lib-rt/pythoncapi_compat.h 2025-05-05
16:10:16.167068167 +0200
@@ -30,6 +30,7 @@
# define _Py_CAST(type, expr) ((type)(expr))
#endif
+#ifndef _Py_NULL
// Static inline functions should use _Py_NULL rather than using directly NULL
// to prevent C++ compiler warnings. On C23 and newer and on C++11 and newer,
// _Py_NULL is defined as nullptr.
@@ -39,6 +40,7 @@
#else
# define _Py_NULL NULL
#endif
+#endif
// Cast argument to PyObject* type.
#ifndef _PyObject_CAST
