Update to 2.2.3.
This commit is contained in:
Susi Lehtola
parent
e39cdd5aa5
commit
d4a1289dad
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/v2.0.1.tar.gz
|
||||
/pybind11-2.2.1.tar.gz
|
||||
/pybind11-2.2.2.tar.gz
|
||||
/pybind11-2.2.3.tar.gz
|
||||
|
||||
34
1287.patch
34
1287.patch
@ -1,34 +0,0 @@
|
||||
From ba9cacf1473f35c231432337b3c596e82d760415 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Rhinelander <jason@imaginary.ca>
|
||||
Date: Sat, 17 Feb 2018 11:07:37 -0400
|
||||
Subject: [PATCH] Fix numpy dtypes test on big-endian architectures
|
||||
|
||||
This fixes the test code on big-endian architectures: the array support
|
||||
(PR #832) had hard-coded the little-endian '<' but we need to use '>' on
|
||||
big-endian architectures.
|
||||
---
|
||||
tests/test_numpy_dtypes.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/test_numpy_dtypes.py b/tests/test_numpy_dtypes.py
|
||||
index ae5a7020d..566682a74 100644
|
||||
--- a/tests/test_numpy_dtypes.py
|
||||
+++ b/tests/test_numpy_dtypes.py
|
||||
@@ -103,7 +103,7 @@ def test_dtype(simple_dtype):
|
||||
partial_nested_fmt(),
|
||||
"[('a', 'S3'), ('b', 'S3')]",
|
||||
("{{'names':['a','b','c','d'], " +
|
||||
- "'formats':[('S4', (3,)),('<i4', (2,)),('u1', (3,)),('<f4', (4, 2))], " +
|
||||
+ "'formats':[('S4', (3,)),('"+e+"i4', (2,)),('u1', (3,)),('"+e+"f4', (4, 2))], " +
|
||||
"'offsets':[0,12,20,24], 'itemsize':56}}").format(e=e),
|
||||
"[('e1', '" + e + "i8'), ('e2', 'u1')]",
|
||||
"[('x', 'i1'), ('y', '" + e + "u8')]",
|
||||
@@ -215,7 +215,7 @@ def test_array_array():
|
||||
arr = m.create_array_array(3)
|
||||
assert str(arr.dtype) == (
|
||||
"{{'names':['a','b','c','d'], " +
|
||||
- "'formats':[('S4', (3,)),('<i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], " +
|
||||
+ "'formats':[('S4', (3,)),('"+e+"i4', (2,)),('u1', (3,)),('{e}f4', (4, 2))], " +
|
||||
"'offsets':[0,12,20,24], 'itemsize':56}}").format(e=e)
|
||||
assert m.print_array_array(arr) == [
|
||||
"a={{A,B,C,D},{K,L,M,N},{U,V,W,X}},b={0,1}," +
|
||||
@ -1,15 +0,0 @@
|
||||
diff -up pybind11-2.2.2/pybind11/__init__.py.orig pybind11-2.2.2/pybind11/__init__.py
|
||||
--- pybind11-2.2.2/pybind11/__init__.py.orig 2018-02-07 10:59:22.000000000 +0100
|
||||
+++ pybind11-2.2.2/pybind11/__init__.py 2018-04-16 11:52:24.631585674 +0200
|
||||
@@ -2,10 +2,4 @@ from ._version import version_info, __ve
|
||||
|
||||
|
||||
def get_include(*args, **kwargs):
|
||||
- import os
|
||||
- try:
|
||||
- from pip import locations
|
||||
- return os.path.dirname(
|
||||
- locations.distutils_scheme('pybind11', *args, **kwargs)['headers'])
|
||||
- except ImportError:
|
||||
- return 'include'
|
||||
+ return '/usr/include/pybind11'
|
||||
33
pybind11-2.2.3-nopip.patch
Normal file
33
pybind11-2.2.3-nopip.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff -up pybind11-2.2.3/pybind11/__init__.py.orig pybind11-2.2.3/pybind11/__init__.py
|
||||
--- pybind11-2.2.3/pybind11/__init__.py.orig 2018-06-22 14:45:24.783361962 +0200
|
||||
+++ pybind11-2.2.3/pybind11/__init__.py 2018-06-22 14:46:31.708289349 +0200
|
||||
@@ -1,28 +1,4 @@
|
||||
from ._version import version_info, __version__ # noqa: F401 imported but unused
|
||||
|
||||
-
|
||||
def get_include(user=False):
|
||||
- from distutils.dist import Distribution
|
||||
- import os
|
||||
- import sys
|
||||
-
|
||||
- # Are we running in a virtual environment?
|
||||
- virtualenv = hasattr(sys, 'real_prefix') or \
|
||||
- sys.prefix != getattr(sys, "base_prefix", sys.prefix)
|
||||
-
|
||||
- if virtualenv:
|
||||
- return os.path.join(sys.prefix, 'include', 'site',
|
||||
- 'python' + sys.version[:3])
|
||||
- else:
|
||||
- dist = Distribution({'name': 'pybind11'})
|
||||
- dist.parse_config_files()
|
||||
-
|
||||
- dist_cobj = dist.get_command_obj('install', create=True)
|
||||
-
|
||||
- # Search for packages in user's home directory?
|
||||
- if user:
|
||||
- dist_cobj.user = user
|
||||
- dist_cobj.prefix = ""
|
||||
- dist_cobj.finalize_options()
|
||||
-
|
||||
- return os.path.dirname(dist_cobj.install_headers)
|
||||
+ return '/usr/include/pybind11'
|
||||
@ -5,17 +5,15 @@
|
||||
%global debug_package %{nil}
|
||||
|
||||
Name: pybind11
|
||||
Version: 2.2.2
|
||||
Release: 4%{?dist}
|
||||
Version: 2.2.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Seamless operability between C++11 and Python
|
||||
License: BSD
|
||||
URL: https://github.com/pybind/pybind11
|
||||
Source0: https://github.com/pybind/pybind11/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
# Little-endian fix
|
||||
Patch0: 1287.patch
|
||||
|
||||
# Don't use pip to get path to headers
|
||||
Patch1: pybind11-2.2.2-nopip.patch
|
||||
Patch1: pybind11-2.2.3-nopip.patch
|
||||
|
||||
# Needed to build the python libraries
|
||||
BuildRequires: python2-devel
|
||||
@ -78,7 +76,6 @@ This package contains the Python 3 files.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .endian
|
||||
%patch1 -p1 -b .nopip
|
||||
|
||||
%build
|
||||
@ -118,6 +115,9 @@ PYBIND11_USE_CMAKE=true %py3_install "--install-purelib" "%{python3_sitearch}"
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jun 22 2018 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.2.3-1
|
||||
- Update to 2.2.3.
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.2.2-4
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (pybind11-2.2.2.tar.gz) = abc7bd1b27945ab25cd818126454d073f6e6bacf73f733cc686ab2eb0ceedba028fc261803916af001d2c658a7097da1aa292759f311fbc7ab23f971f7b7231f
|
||||
SHA512 (pybind11-2.2.3.tar.gz) = 3a43b43f44ae4a6453fe3b875384acc868310177216938cb564536e6b73c56002743137e5f61cf4ecbd6c56e3b39476ebf06aea33d460581fc7d8ba7b2a22a67
|
||||
|
||||
Loading…
Reference in New Issue
Block a user