Update to 2.3.0.
This commit is contained in:
		
							parent
							
								
									04f9751923
								
							
						
					
					
						commit
						7d7576c10d
					
				
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -3,3 +3,4 @@ | ||||
| /pybind11-2.2.2.tar.gz | ||||
| /pybind11-2.2.3.tar.gz | ||||
| /pybind11-2.2.4.tar.gz | ||||
| /pybind11-2.3.0.tar.gz | ||||
|  | ||||
| @ -1,54 +0,0 @@ | ||||
| From e7ef34f23f194cfa40bdbf967c6d34712261a4ee Mon Sep 17 00:00:00 2001 | ||||
| From: Guilhem Saurel <guilhem.saurel@gmail.com> | ||||
| Date: Wed, 23 Jan 2019 14:22:39 +0100 | ||||
| Subject: [PATCH] compatibility with pytest 4.0, fix #1670 | ||||
| 
 | ||||
| Cf. https://docs.pytest.org/en/latest/deprecations.html#pytest-namespace | ||||
| ---
 | ||||
|  tests/conftest.py | 26 ++++++++++++-------------- | ||||
|  1 file changed, 12 insertions(+), 14 deletions(-) | ||||
| 
 | ||||
| diff --git a/tests/conftest.py b/tests/conftest.py
 | ||||
| index f4c228260..0b76395cc 100644
 | ||||
| --- a/tests/conftest.py
 | ||||
| +++ b/tests/conftest.py
 | ||||
| @@ -185,7 +185,7 @@ def gc_collect():
 | ||||
|      gc.collect() | ||||
|   | ||||
|   | ||||
| -def pytest_namespace():
 | ||||
| +def pytest_configure():
 | ||||
|      """Add import suppression and test requirements to `pytest` namespace""" | ||||
|      try: | ||||
|          import numpy as np | ||||
| @@ -202,19 +202,17 @@ def pytest_namespace():
 | ||||
|      pypy = platform.python_implementation() == "PyPy" | ||||
|   | ||||
|      skipif = pytest.mark.skipif | ||||
| -    return {
 | ||||
| -        'suppress': suppress,
 | ||||
| -        'requires_numpy': skipif(not np, reason="numpy is not installed"),
 | ||||
| -        'requires_scipy': skipif(not np, reason="scipy is not installed"),
 | ||||
| -        'requires_eigen_and_numpy': skipif(not have_eigen or not np,
 | ||||
| -                                           reason="eigen and/or numpy are not installed"),
 | ||||
| -        'requires_eigen_and_scipy': skipif(not have_eigen or not scipy,
 | ||||
| -                                           reason="eigen and/or scipy are not installed"),
 | ||||
| -        'unsupported_on_pypy': skipif(pypy, reason="unsupported on PyPy"),
 | ||||
| -        'unsupported_on_py2': skipif(sys.version_info.major < 3,
 | ||||
| -                                     reason="unsupported on Python 2.x"),
 | ||||
| -        'gc_collect': gc_collect
 | ||||
| -    }
 | ||||
| +    pytest.suppress = suppress
 | ||||
| +    pytest.requires_numpy = skipif(not np, reason="numpy is not installed")
 | ||||
| +    pytest.requires_scipy = skipif(not np, reason="scipy is not installed")
 | ||||
| +    pytest.requires_eigen_and_numpy = skipif(not have_eigen or not np,
 | ||||
| +                                             reason="eigen and/or numpy are not installed")
 | ||||
| +    pytest.requires_eigen_and_scipy = skipif(
 | ||||
| +        not have_eigen or not scipy, reason="eigen and/or scipy are not installed")
 | ||||
| +    pytest.unsupported_on_pypy = skipif(pypy, reason="unsupported on PyPy")
 | ||||
| +    pytest.unsupported_on_py2 = skipif(sys.version_info.major < 3,
 | ||||
| +                                       reason="unsupported on Python 2.x")
 | ||||
| +    pytest.gc_collect = gc_collect
 | ||||
|   | ||||
|   | ||||
|  def _test_import_pybind11(): | ||||
| @ -14,8 +14,8 @@ | ||||
| 
 | ||||
| 
 | ||||
| Name:    pybind11 | ||||
| Version: 2.2.4 | ||||
| Release: 3%{?dist} | ||||
| Version: 2.3.0 | ||||
| Release: 1%{?dist} | ||||
| Summary: Seamless operability between C++11 and Python | ||||
| License: BSD | ||||
| URL:	 https://github.com/pybind/pybind11 | ||||
| @ -23,8 +23,6 @@ Source0: https://github.com/pybind/pybind11/archive/v%{version}/%{name}-%{versio | ||||
| 
 | ||||
| # Don't use pip to get path to headers | ||||
| Patch1:  pybind11-2.2.3-nopip.patch | ||||
| # Fix pytest 4 incompatibility | ||||
| Patch2:  https://github.com/pybind/pybind11/commit/e7ef34f23f194cfa40bdbf967c6d34712261a4ee.patch | ||||
| 
 | ||||
| %if %{python2_enabled} | ||||
| # Needed to build the python libraries | ||||
| @ -103,7 +101,6 @@ This package contains the Python 3 files. | ||||
| %prep | ||||
| %setup -q | ||||
| %patch1 -p1 -b .nopip | ||||
| %patch2 -p1 -b .pytest4 | ||||
| 
 | ||||
| %build | ||||
| pys="" | ||||
| @ -171,6 +168,9 @@ PYBIND11_USE_CMAKE=true %py3_install "--install-purelib" "%{python3_sitearch}" | ||||
| %endif | ||||
| 
 | ||||
| %changelog | ||||
| * Wed Jul 10 2019 Susi Lehtola - 2.3.0-1 | ||||
| - Update to 2.3.0. | ||||
| 
 | ||||
| * Fri May 03 2019 Susi Lehtola - 2.2.4-3 | ||||
| - Fix incompatibility with pytest 4.0. | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										2
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								sources
									
									
									
									
									
								
							| @ -1 +1 @@ | ||||
| SHA512 (pybind11-2.2.4.tar.gz) = 6bddf5c885ff92a3e373bcedc6574dfefe8be9ebb6176c6c96d475457466c76bfb982c6df4066cb0fbead4b867f87dbc4fbc1605c80852635016f614330ce041 | ||||
| SHA512 (pybind11-2.3.0.tar.gz) = 04542fe9dca2ffdb86c15698a4bbc041446a9f11970092e89a482ae0ff64c932f62fff8f437b98bdaa006c1fccabddd79f0c7e376f27daed2150b1d2f988e8aa | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user