Compare commits
No commits in common. "c10s" and "c8-stream-3.9" have entirely different histories.
c10s
...
c8-stream-
@ -1 +0,0 @@
|
||||
1
|
||||
27
.gitignore
vendored
27
.gitignore
vendored
@ -1,26 +1 @@
|
||||
/v2.0.1.tar.gz
|
||||
/pybind11-2.2.1.tar.gz
|
||||
/pybind11-2.2.2.tar.gz
|
||||
/pybind11-2.2.3.tar.gz
|
||||
/pybind11-2.2.4.tar.gz
|
||||
/pybind11-2.3.0.tar.gz
|
||||
/pybind11-2.4.0.tar.gz
|
||||
/pybind11-2.4.1.tar.gz
|
||||
/pybind11-2.4.2.tar.gz
|
||||
/pybind11-2.4.3.tar.gz
|
||||
/pybind11-2.5.0.tar.gz
|
||||
/pybind11-2.6.0.tar.gz
|
||||
/pybind11-2.6.1.tar.gz
|
||||
/pybind11-2.6.2.tar.gz
|
||||
/pybind11-2.7.0.tar.gz
|
||||
/pybind11-2.7.1.tar.gz
|
||||
/v2.8.1.tar.gz
|
||||
/pybind11-2.9.0.tar.gz
|
||||
/pybind11-2.9.1.tar.gz
|
||||
/pybind11-2.9.2.tar.gz
|
||||
/pybind11-2.10.0.tar.gz
|
||||
/pybind11-2.10.1.tar.gz
|
||||
/pybind11-2.10.3.tar.gz
|
||||
/pybind11-2.10.4.tar.gz
|
||||
/pybind11-2.11.0.tar.gz
|
||||
/pybind11-2.11.1.tar.gz
|
||||
SOURCES/pybind11-2.7.1.tar.gz
|
||||
|
||||
1
.pybind11.metadata
Normal file
1
.pybind11.metadata
Normal file
@ -0,0 +1 @@
|
||||
8ddca54a17e646aa3e42488b0a0cb250f8b8ed83 SOURCES/pybind11-2.7.1.tar.gz
|
||||
32
4902.patch
32
4902.patch
@ -1,32 +0,0 @@
|
||||
From 4fb75b73c902deae5a4805bb9e4ea6451952183e Mon Sep 17 00:00:00 2001
|
||||
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
||||
Date: Tue, 24 Oct 2023 15:59:02 +0200
|
||||
Subject: [PATCH] Adapt to changed function name in Python 3.13
|
||||
|
||||
According to https://docs.python.org/3.13/whatsnew/3.13.html:
|
||||
|
||||
Add PyThreadState_GetUnchecked() function: similar to
|
||||
PyThreadState_Get(), but don't kill the process with a fatal error if
|
||||
it is NULL. The caller is responsible to check if the result is
|
||||
NULL. Previously, the function was private and known as
|
||||
_PyThreadState_UncheckedGet().
|
||||
---
|
||||
include/pybind11/detail/type_caster_base.h | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/pybind11/detail/type_caster_base.h b/include/pybind11/detail/type_caster_base.h
|
||||
index fc5f1c88b3..68512b5bd0 100644
|
||||
--- a/include/pybind11/detail/type_caster_base.h
|
||||
+++ b/include/pybind11/detail/type_caster_base.h
|
||||
@@ -486,8 +486,10 @@ PYBIND11_NOINLINE handle get_object_handle(const void *ptr, const detail::type_i
|
||||
inline PyThreadState *get_thread_state_unchecked() {
|
||||
#if defined(PYPY_VERSION)
|
||||
return PyThreadState_GET();
|
||||
-#else
|
||||
+#elif PY_VERSION_HEX < 0x030D0000
|
||||
return _PyThreadState_UncheckedGet();
|
||||
+#else
|
||||
+ return PyThreadState_GetUnchecked();
|
||||
#endif
|
||||
}
|
||||
|
||||
30
SOURCES/pybind11-2.6.1-hpath.patch
Normal file
30
SOURCES/pybind11-2.6.1-hpath.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff -up pybind11-2.6.1/pybind11/commands.py.hpath pybind11-2.6.1/pybind11/commands.py
|
||||
--- pybind11-2.6.1/pybind11/commands.py.hpath 2020-11-11 22:33:21.000000000 +0100
|
||||
+++ pybind11-2.6.1/pybind11/commands.py 2020-11-12 13:22:07.355000414 +0100
|
||||
@@ -1,22 +1,8 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import os
|
||||
|
||||
-
|
||||
-DIR = os.path.abspath(os.path.dirname(__file__))
|
||||
-
|
||||
-
|
||||
def get_include(user=False):
|
||||
- # type: (bool) -> str
|
||||
- installed_path = os.path.join(DIR, "include")
|
||||
- source_path = os.path.join(os.path.dirname(DIR), "include")
|
||||
- return installed_path if os.path.exists(installed_path) else source_path
|
||||
-
|
||||
+ return '/usr/include/pybind11'
|
||||
|
||||
def get_cmake_dir():
|
||||
- # type: () -> str
|
||||
- cmake_installed_path = os.path.join(DIR, "share", "cmake", "pybind11")
|
||||
- if os.path.exists(cmake_installed_path):
|
||||
- return cmake_installed_path
|
||||
- else:
|
||||
- msg = "pybind11 not installed, installation required to access the CMake files"
|
||||
- raise ImportError(msg)
|
||||
+ return '/usr/share/cmake/pybind11'
|
||||
diff -up pybind11-2.6.1/pybind11/__init__.py.hpath pybind11-2.6.1/pybind11/__init__.py
|
||||
diff -up pybind11-2.6.1/pybind11/__main__.py.hpath pybind11-2.6.1/pybind11/__main__.py
|
||||
@ -7,51 +7,33 @@
|
||||
# Whether to run the tests, enabled by default
|
||||
%bcond_without tests
|
||||
|
||||
%if 0%{?fedora} >= 30 || 0%{?rhel} >= 9
|
||||
%global python2_enabled 0
|
||||
%else
|
||||
%global python2_enabled 1
|
||||
%endif
|
||||
|
||||
%global python3_enabled 1
|
||||
|
||||
Name: pybind11
|
||||
Version: 2.11.1
|
||||
Release: 7%{?dist}
|
||||
Version: 2.7.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Seamless operability between C++11 and Python
|
||||
License: BSD-3-Clause
|
||||
URL: https://github.com/pybind/pybind11
|
||||
License: BSD
|
||||
URL: https://github.com/pybind/pybind11
|
||||
Source0: https://github.com/pybind/pybind11/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# Patch out header path
|
||||
Patch1: pybind11-2.10.1-hpath.patch
|
||||
# Exclude i686 arch. Due to a modularity issue it's being added to the
|
||||
# x86_64 compose of CRB, but we don't want to ship it at all.
|
||||
# See: https://projects.engineering.redhat.com/browse/RCM-72605
|
||||
ExcludeArch: i686
|
||||
|
||||
# Adapt to changed function name in Python 3.13
|
||||
Patch2: https://github.com/pybind/pybind11/pull/4902.patch
|
||||
# Patch out header path
|
||||
Patch1: pybind11-2.6.1-hpath.patch
|
||||
|
||||
BuildRequires: make
|
||||
%if %{python2_enabled}
|
||||
# Needed to build the python libraries
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
# These are only needed for the checks
|
||||
%if %{with tests}
|
||||
BuildRequires: python2-pytest
|
||||
BuildRequires: python2-numpy
|
||||
BuildRequires: python2-scipy
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{python3_enabled}
|
||||
# Needed to build the python libraries
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: python%{python3_pkgversion}-rpm-macros
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
# These are only needed for the checks
|
||||
%if %{with tests}
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-numpy
|
||||
BuildRequires: python3-scipy
|
||||
%endif
|
||||
BuildRequires: python%{python3_pkgversion}-pytest
|
||||
BuildRequires: python%{python3_pkgversion}-numpy
|
||||
BuildRequires: python%{python3_pkgversion}-scipy
|
||||
%endif
|
||||
|
||||
BuildRequires: eigen3-devel
|
||||
@ -66,220 +48,92 @@ C++ code.
|
||||
%description
|
||||
%{base_description}
|
||||
|
||||
%package devel
|
||||
|
||||
%package -n python%{python3_pkgversion}-%{name}-devel
|
||||
Summary: Development headers for pybind11
|
||||
|
||||
# This package does not have namespaced file locations, so if we build the
|
||||
# pybind11-devel subpackage in any other module as well, the files from these
|
||||
# packages will conflict. The package name is namespaced so that customers can
|
||||
# decide which to install, but the packages will conflict with each other.
|
||||
Provides: %{name}-devel = %{version}-%{release}
|
||||
Conflicts: %{name}-devel < %{version}-%{release}
|
||||
|
||||
# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Header_Only_Libraries
|
||||
Provides: %{name}-static = %{version}-%{release}
|
||||
Provides: python%{python3_pkgversion}-%{name}-static = %{version}-%{release}
|
||||
# For dir ownership
|
||||
Requires: cmake
|
||||
|
||||
%description devel
|
||||
%description -n python%{python3_pkgversion}-%{name}-devel
|
||||
%{base_description}
|
||||
|
||||
This package contains the development headers for pybind11.
|
||||
|
||||
%if %{python2_enabled}
|
||||
%package -n python2-%{name}
|
||||
%package -n python%{python3_pkgversion}-%{name}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python2-pybind11}
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
%{?python_provide:%python_provide python%{python3_pkgversion}-pybind11}
|
||||
|
||||
%description -n python2-%{name}
|
||||
%{base_description}
|
||||
Requires: python%{python3_pkgversion}-%{name}-devel%{?_isa} = %{version}-%{release}
|
||||
Requires: python%{python3_pkgversion}-setuptools
|
||||
|
||||
This package contains the Python 2 files.
|
||||
%endif
|
||||
|
||||
%if %{python3_enabled}
|
||||
%package -n python3-%{name}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python3-pybind11}
|
||||
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
|
||||
%if !%{python2_enabled}
|
||||
# Take care of upgrade path
|
||||
Obsoletes: python2-%{name} < %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description -n python3-%{name}
|
||||
%description -n python%{python3_pkgversion}-%{name}
|
||||
%{base_description}
|
||||
|
||||
This package contains the Python 3 files.
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .hpath
|
||||
%patch2 -p1 -b .4902
|
||||
|
||||
%build
|
||||
pys=""
|
||||
%if %{python2_enabled}
|
||||
pys="$pys python2"
|
||||
%endif
|
||||
%if %{python3_enabled}
|
||||
pys="$pys python3"
|
||||
%endif
|
||||
for py in $pys; do
|
||||
mkdir $py
|
||||
# When -DCMAKE_BUILD_TYPE is set to Release, the tests in %%check might segfault.
|
||||
cd $py
|
||||
# When -DCMAKE_BUILD_TYPE is set to Release, the tests in %%check segfault.
|
||||
# However, we do not ship any binaries, and therefore Debug
|
||||
# build type does not affect the results.
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1921199
|
||||
%cmake -B $py -DCMAKE_BUILD_TYPE=Debug -DPYTHON_EXECUTABLE=%{_bindir}/$py -DPYBIND11_INSTALL=TRUE -DUSE_PYTHON_INCLUDE_DIR=FALSE %{!?with_tests:-DPYBIND11_TEST=OFF}
|
||||
%make_build -C $py
|
||||
%cmake .. -DCMAKE_BUILD_TYPE=Debug -DPYTHON_EXECUTABLE=%{__python3} -DPYBIND11_INSTALL=TRUE -DUSE_PYTHON_INCLUDE_DIR=FALSE %{!?with_tests:-DPYBIND11_TEST=OFF}
|
||||
%make_build
|
||||
cd ..
|
||||
done
|
||||
|
||||
%if %{python2_enabled}
|
||||
%py2_build
|
||||
%endif
|
||||
%if %{python3_enabled}
|
||||
%py3_build
|
||||
%endif
|
||||
|
||||
%if %{with tests}
|
||||
%check
|
||||
%if %{python2_enabled}
|
||||
make -C python2 check %{?_smp_mflags}
|
||||
%endif
|
||||
%if %{python3_enabled}
|
||||
make -C python3 check %{?_smp_mflags}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%install
|
||||
# Doesn't matter if both installs run
|
||||
%if %{python2_enabled}
|
||||
%make_install -C python2
|
||||
%endif
|
||||
%if %{python3_enabled}
|
||||
%make_install -C python3
|
||||
%endif
|
||||
# Force install to arch-ful directories instead.
|
||||
%if %{python2_enabled}
|
||||
PYBIND11_USE_CMAKE=true %py2_install "--install-purelib" "%{python2_sitearch}"
|
||||
%endif
|
||||
%if %{python3_enabled}
|
||||
PYBIND11_USE_CMAKE=true %py3_install "--install-purelib" "%{python3_sitearch}"
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%files -n python%{python3_pkgversion}-%{name}-devel
|
||||
%license LICENSE
|
||||
%doc README.rst
|
||||
%{_includedir}/pybind11/
|
||||
%{_datadir}/cmake/pybind11/
|
||||
%{_bindir}/pybind11-config
|
||||
%{_datadir}/pkgconfig/%{name}.pc
|
||||
|
||||
%if %{python2_enabled}
|
||||
%files -n python2-%{name}
|
||||
%{python2_sitearch}/%{name}/
|
||||
%{python2_sitearch}/%{name}-%{version}-py?.?.egg-info
|
||||
%endif
|
||||
|
||||
%if %{python3_enabled}
|
||||
%files -n python3-%{name}
|
||||
%files -n python%{python3_pkgversion}-%{name}
|
||||
%{python3_sitearch}/%{name}/
|
||||
%{python3_sitearch}/%{name}-%{version}-py%{python3_version}.egg-info
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.11.1-7
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
* Fri Oct 01 2021 Charalampos Stratakis <cstratak@redhat.com> - 2.7.1-1
|
||||
- Update to 2.7.1
|
||||
- Resolves: rhbz#2000212
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.11.1-6
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Mon Apr 29 2024 Pavel Simovec <psimovec@redhat.com> - 2.11.1-5
|
||||
- rebuilt
|
||||
- Resolves: RHEL-34668
|
||||
|
||||
* Mon Apr 29 2024 Pavel Simovec <psimovec@redhat.com> - 2.11.1-4
|
||||
- Migrate to SPDX license format
|
||||
- Resolves: RHEL-34668
|
||||
|
||||
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.11.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Mon Jul 24 2023 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.11.1-1
|
||||
- Update to 2.11.1.
|
||||
|
||||
* Mon Jul 24 2023 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.11.0-1
|
||||
- Update to 2.11.0.
|
||||
|
||||
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 2.10.4-3
|
||||
- Rebuilt for Python 3.12
|
||||
|
||||
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.10.4-2
|
||||
- Bootstrap for Python 3.12
|
||||
|
||||
* Fri Mar 17 2023 Pavel Šimovec <psimovec@redhat.com> - 2.10.4-1
|
||||
- Update to 2.10.4 rhbz#2179208
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Jan 09 2023 Jonathan Wright <jonathan@almalinux.org> - 2.10.3-1
|
||||
- Update to 2.10.3 rhbz#2155679
|
||||
|
||||
* Mon Nov 07 2022 Jonathan Wright <jonathan@almalinux.org> - 2.10.1-1
|
||||
- Update to 2.10.1 rhbz#2139245
|
||||
|
||||
* Tue Aug 02 2022 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.10.0-1
|
||||
- Update to 2.10.0.
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 2.9.2-3
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.9.2-2
|
||||
- Bootstrap for Python 3.11
|
||||
|
||||
* Sat Apr 02 2022 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.9.2-1
|
||||
- Update to 2.9.2.
|
||||
|
||||
* Tue Feb 08 2022 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.9.1-1
|
||||
- Update to 2.9.1.
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Dec 29 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.9.0-1
|
||||
- Update to 2.9.0.
|
||||
|
||||
* Fri Nov 26 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.8.1-1
|
||||
- Update to 2.8.1.
|
||||
|
||||
* Wed Aug 04 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.7.1-1
|
||||
- Update to 2.7.1.
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Sat Jul 17 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.7.0-1
|
||||
- Update to 2.7.0.
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.6.2-3
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.6.2-2
|
||||
- Bootstrap for Python 3.10
|
||||
|
||||
* Wed Jan 27 2021 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.6.2-1
|
||||
- Update to 2.6.2.
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
* Mon Jan 18 2021 Tomas Orsava <torsava@redhat.com> - 2.6.1-2
|
||||
- Convert from Fedora to the python39 module in RHEL8
|
||||
- Resolves: rhbz#1877430
|
||||
|
||||
* Thu Nov 12 2020 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.6.1-1
|
||||
- Update to 2.6.1.
|
||||
2
ci.fmf
2
ci.fmf
@ -1,2 +0,0 @@
|
||||
# Docs: https://docs.fedoraproject.org/en-US/ci/tmt/#_multiple_plans
|
||||
resultsdb-testcase: separate
|
||||
@ -1,6 +0,0 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-*
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
|
||||
@ -1,5 +0,0 @@
|
||||
/tier1-internal:
|
||||
plan:
|
||||
import:
|
||||
url: https://pkgs.devel.redhat.com/git/tests/pybind11
|
||||
name: /plans/all
|
||||
@ -1,28 +0,0 @@
|
||||
diff -uNr pybind11-2.10.1.bak/pybind11/commands.py pybind11-2.10.1/pybind11/commands.py
|
||||
--- pybind11-2.10.1.bak/pybind11/commands.py 2022-11-07 15:25:26.651515082 -0600
|
||||
+++ pybind11-2.10.1/pybind11/commands.py 2022-11-07 15:27:01.574703289 -0600
|
||||
@@ -8,22 +8,13 @@
|
||||
Return the path to the pybind11 include directory. The historical "user"
|
||||
argument is unused, and may be removed.
|
||||
"""
|
||||
- installed_path = os.path.join(DIR, "include")
|
||||
- source_path = os.path.join(os.path.dirname(DIR), "include")
|
||||
- return installed_path if os.path.exists(installed_path) else source_path
|
||||
-
|
||||
+ return '/usr/include/pybind11'
|
||||
|
||||
def get_cmake_dir() -> str:
|
||||
"""
|
||||
Return the path to the pybind11 CMake module directory.
|
||||
"""
|
||||
- cmake_installed_path = os.path.join(DIR, "share", "cmake", "pybind11")
|
||||
- if os.path.exists(cmake_installed_path):
|
||||
- return cmake_installed_path
|
||||
-
|
||||
- msg = "pybind11 not installed, installation required to access the CMake files"
|
||||
- raise ImportError(msg)
|
||||
-
|
||||
+ return '/usr/share/cmake/pybind11'
|
||||
|
||||
def get_pkgconfig_dir() -> str:
|
||||
"""
|
||||
Loading…
Reference in New Issue
Block a user