mirror of
https://github.com/boostorg/python.git
synced 2026-01-19 16:32:16 +00:00
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
97402f7925 | ||
|
|
668bc7c106 | ||
|
|
5f5f38fa8a | ||
|
|
cc873d9682 | ||
|
|
20de46cd0c | ||
|
|
5d7b9a0648 | ||
|
|
608ec27c4d | ||
|
|
7fd39323ac | ||
|
|
2b6f667e98 | ||
|
|
aa458d2ca9 | ||
|
|
16627261f1 | ||
|
|
303299e677 | ||
|
|
cb95b611bb | ||
|
|
b4fb28e99a | ||
|
|
867f0dddfe | ||
|
|
a40bb656ee | ||
|
|
f604eb8d0f | ||
|
|
d30c1bb7a8 |
8
.github/workflows/deploy-documentation.yml
vendored
8
.github/workflows/deploy-documentation.yml
vendored
@@ -4,14 +4,14 @@ on: [push]
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v5
|
||||
- name: setup
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install \
|
||||
libboost1.71-tools-dev \
|
||||
libboost-tools-dev \
|
||||
python3 \
|
||||
python3-numpy \
|
||||
python3-sphinx \
|
||||
@@ -29,7 +29,7 @@ jobs:
|
||||
echo "destination_dir=doc/develop/html" >> $GITHUB_ENV
|
||||
fi
|
||||
- name: deploy
|
||||
uses: peaceiris/actions-gh-pages@v3
|
||||
uses: peaceiris/actions-gh-pages@v4
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
publish_dir: build/doc/html
|
||||
|
||||
4
.github/workflows/test-osx.yml
vendored
4
.github/workflows/test-osx.yml
vendored
@@ -14,9 +14,9 @@ jobs:
|
||||
std: [c++11, c++14] # TODO: c++17 is failing !
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
- name: setup python
|
||||
uses: actions/setup-python@v5
|
||||
uses: actions/setup-python@v6
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
- name: setup prerequisites
|
||||
|
||||
12
.github/workflows/test-ubuntu.yml
vendored
12
.github/workflows/test-ubuntu.yml
vendored
@@ -11,23 +11,27 @@ jobs:
|
||||
matrix:
|
||||
python: [python, python3]
|
||||
cxx: [g++, clang++]
|
||||
std: [c++98, c++11, c++14, c++17]
|
||||
std: [c++11, c++14, c++17]
|
||||
include:
|
||||
# Add the appropriate docker image for each compiler.
|
||||
# The images from teeks99/boost-python-test already have boost::python
|
||||
# pre-reqs installed, see:
|
||||
# https://github.com/teeks99/boost-python-test-docker
|
||||
- cxx: clang++
|
||||
docker-img: teeks99/boost-python-test:clang-12_1.76.0
|
||||
docker-img: teeks99/boost-python-test:clang-21_1.89.0
|
||||
- cxx: g++
|
||||
docker-img: teeks99/boost-python-test:gcc-10_1.76.0
|
||||
docker-img: teeks99/boost-python-test:gcc-15_1.89.0
|
||||
|
||||
container:
|
||||
image: ${{ matrix.docker-img }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: setup prerequisites
|
||||
run: |
|
||||
# Warning: this is not necessarily the same Python version as the one configured above !
|
||||
python3 -m pip install -U faber --break-system-packages
|
||||
- name: build
|
||||
run: |
|
||||
${{ matrix.python }} --version
|
||||
|
||||
10
.github/workflows/test-windows.yml
vendored
10
.github/workflows/test-windows.yml
vendored
@@ -11,11 +11,11 @@ jobs:
|
||||
python-version: [3.7]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-python@v6
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
- uses: microsoft/setup-msbuild@v1.1
|
||||
- uses: microsoft/setup-msbuild@v2
|
||||
- name: setup boost prerequisites
|
||||
uses: lukka/run-vcpkg@v6
|
||||
with:
|
||||
@@ -42,8 +42,8 @@ jobs:
|
||||
- name: build
|
||||
shell: cmd
|
||||
run: |
|
||||
faber --builddir=build cxx.name=msvc --with-boost-include=${{ runner.workspace }}/vcpkg/installed/x64-windows/include -j4
|
||||
faber --builddir=build cxx.name=msvc --log=commands --log=output --with-boost-include=${{ runner.workspace }}\vcpkg\installed\x64-windows\include -j4
|
||||
- name: test
|
||||
shell: cmd
|
||||
run: |
|
||||
faber --builddir=build cxx.name=msvc --with-boost-include=${{ runner.workspace }}/vcpkg/installed/x64-windows/include -j4 test.report
|
||||
faber --builddir=build cxx.name=msvc --with-boost-include=${{ runner.workspace }}\vcpkg\installed\x64-windows\include -j4 test.report
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
<tr>
|
||||
<td valign="top" width="300">
|
||||
<h3><a href="{{ pathto('index') }}"><img
|
||||
alt="C++ Boost" src="{{ pathto('_static/' + logo, 1) }}" border="0"></a></h3>
|
||||
alt="C++ Boost" src="{{ pathto('_static/bpl.png', 1) }}" border="0"></a></h3>
|
||||
</td>
|
||||
|
||||
<td >
|
||||
|
||||
@@ -40,8 +40,8 @@ source_suffix = '.rst'
|
||||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = u'Boost.Python NumPy extension'
|
||||
copyright = u'2011, Stefan Seefeld'
|
||||
project = 'Boost.Python NumPy extension'
|
||||
copyright = '2011, Stefan Seefeld'
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
# |version| and |release|, also used in various other places throughout the
|
||||
@@ -181,8 +181,8 @@ html_add_permalinks = False
|
||||
# Grouping the document tree into LaTeX files. List of tuples
|
||||
# (source start file, target name, title, author, documentclass [howto/manual]).
|
||||
latex_documents = [
|
||||
('index', 'BoostPythonNumPy.tex', u'Boost.Python NumPy Documentation',
|
||||
u'Stefan Seefeld', 'manual'),
|
||||
('index', 'BoostPythonNumPy.tex', 'Boost.Python NumPy Documentation',
|
||||
'Stefan Seefeld', 'manual'),
|
||||
]
|
||||
|
||||
# The name of an image file (relative to this directory) to place at the top of
|
||||
@@ -214,6 +214,6 @@ latex_documents = [
|
||||
# One entry per manual page. List of tuples
|
||||
# (source start file, name, description, authors, manual section).
|
||||
man_pages = [
|
||||
('index', 'boostnumpy', u'Boost.Python NumPy Documentation',
|
||||
[u'Stefan Seefeld'], 1)
|
||||
('index', 'boostnumpy', 'Boost.Python NumPy Documentation',
|
||||
['Stefan Seefeld'], 1)
|
||||
]
|
||||
|
||||
@@ -117,7 +117,7 @@ platforms. The complete list of Bjam executables can be found
|
||||
[h2 Let's Jam!]
|
||||
__jam__
|
||||
|
||||
[@../../../../example/tutorial/Jamroot Here] is our minimalist Jamroot
|
||||
[@../example/Jamroot Here] is our minimalist Jamroot
|
||||
file. Simply copy the file and tweak [^use-project boost] to where your
|
||||
boost root directory is and you're OK.
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
# (See accompanying file LICENSE_1_0.txt or copy at
|
||||
# http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
from __future__ import print_function
|
||||
import numpy
|
||||
import gaussian
|
||||
|
||||
@@ -19,19 +20,19 @@ x, y = numpy.meshgrid(r, r)
|
||||
z = g(x, y)
|
||||
|
||||
s = z.sum() * (r[1] - r[0])**2
|
||||
print "sum (should be ~ 1):", s
|
||||
print("sum (should be ~ 1):", s)
|
||||
|
||||
xc = (z * x).sum() / z.sum()
|
||||
print "x centroid (should be ~ %f): %f" % (mu[0], xc)
|
||||
print("x centroid (should be ~ %f): %f" % (mu[0], xc))
|
||||
|
||||
yc = (z * y).sum() / z.sum()
|
||||
print "y centroid (should be ~ %f): %f" % (mu[1], yc)
|
||||
print("y centroid (should be ~ %f): %f" % (mu[1], yc))
|
||||
|
||||
xx = (z * (x - xc)**2).sum() / z.sum()
|
||||
print "xx moment (should be ~ %f): %f" % (sigma[0,0], xx)
|
||||
print("xx moment (should be ~ %f): %f" % (sigma[0,0], xx))
|
||||
|
||||
yy = (z * (y - yc)**2).sum() / z.sum()
|
||||
print "yy moment (should be ~ %f): %f" % (sigma[1,1], yy)
|
||||
print("yy moment (should be ~ %f): %f" % (sigma[1,1], yy))
|
||||
|
||||
xy = 0.5 * (z * (x - xc) * (y - yc)).sum() / z.sum()
|
||||
print "xy moment (should be ~ %f): %f" % (sigma[0,1], xy)
|
||||
print("xy moment (should be ~ %f): %f" % (sigma[0,1], xy))
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#! /usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# Copyright Stefan Seefeld 2006. Distributed under the Boost
|
||||
# Software License, Version 1.0. (See accompanying
|
||||
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#! /usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# Copyright Ralf W. Grosse-Kunstleve 2006. Distributed under the Boost
|
||||
# Software License, Version 1.0. (See accompanying
|
||||
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#! /usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
# Copyright Joel de Guzman 2002-2007. Distributed under the Boost
|
||||
# Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt
|
||||
# or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
@@ -16,6 +16,7 @@ from faber.config.try_run import try_run
|
||||
|
||||
features += include('include')
|
||||
features += define('BOOST_ALL_NO_LIB') # disable auto-linking
|
||||
features += define('BOOST_NO_AUTO_PTR')
|
||||
boost_include = options.get_with('boost-include')
|
||||
if boost_include:
|
||||
features += include(boost_include)
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
# ifndef BOOST_NO_AUTO_PTR
|
||||
# include <boost/python/detail/is_xxx.hpp>
|
||||
# include <memory>
|
||||
# else
|
||||
# include <boost/mpl/bool.hpp>
|
||||
# endif
|
||||
|
||||
namespace boost { namespace python { namespace detail {
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <boost/python/numpy/numpy_object_mgr_traits.hpp>
|
||||
#include <boost/mpl/for_each.hpp>
|
||||
#include <boost/python/detail/type_traits.hpp>
|
||||
#include <boost/type_traits/is_unsigned.hpp>
|
||||
|
||||
namespace boost { namespace python { namespace numpy {
|
||||
|
||||
|
||||
@@ -216,7 +216,13 @@ namespace boost { namespace python { namespace detail {
|
||||
{
|
||||
for (const_iterator i = proxies.begin(); i != proxies.end(); ++i)
|
||||
{
|
||||
if ((*i)->ob_refcnt <= 0)
|
||||
if (
|
||||
#if PY_VERSION_HEX < 0x03090000
|
||||
(*i)->ob_refcnt
|
||||
#else
|
||||
Py_REFCNT(*i)
|
||||
#endif
|
||||
<= 0)
|
||||
{
|
||||
PyErr_SetString(PyExc_RuntimeError,
|
||||
"Invariant: Proxy vector in an inconsistent state");
|
||||
|
||||
@@ -161,7 +161,6 @@ PyObject* function::call(PyObject* args, PyObject* keywords) const
|
||||
else
|
||||
{
|
||||
// build a new arg tuple, will adjust its size later
|
||||
assert(max_arity <= static_cast<std::size_t>(ssize_t_max));
|
||||
inner_args = handle<>(
|
||||
PyTuple_New(static_cast<ssize_t>(max_arity)));
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ BOOST_PYTHON_MODULE(back_reference_ext)
|
||||
.def("set", &Y::set)
|
||||
;
|
||||
|
||||
class_<Z,std::auto_ptr<Z> >("Z", init<int>())
|
||||
class_<Z,std::shared_ptr<Z> >("Z", init<int>())
|
||||
.def("value", &Z::value)
|
||||
.def("set", &Z::set)
|
||||
;
|
||||
|
||||
@@ -9,14 +9,13 @@
|
||||
|
||||
struct foo
|
||||
{
|
||||
operator std::auto_ptr<int>&() const;
|
||||
operator std::shared_ptr<int>&() const;
|
||||
};
|
||||
|
||||
int main()
|
||||
{
|
||||
using namespace boost::python::detail;
|
||||
BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<int>::value);
|
||||
BOOST_STATIC_ASSERT(copy_ctor_mutates_rhs<std::auto_ptr<int> >::value);
|
||||
BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<std::string>::value);
|
||||
BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<foo>::value);
|
||||
return 0;
|
||||
|
||||
@@ -118,10 +118,10 @@ for t in [('injected',),
|
||||
|
||||
tests.append(extension_test('shared_ptr',
|
||||
condition=set.define.contains('HAS_CXX11')))
|
||||
tests.append(extension_test('polymorphism2_auto_ptr',
|
||||
condition=set.define.contains('HAS_CXX11').not_()))
|
||||
tests.append(extension_test('auto_ptr',
|
||||
condition=set.define.contains('HAS_CXX11')))
|
||||
#tests.append(extension_test('polymorphism2_auto_ptr',
|
||||
# condition=set.define.contains('HAS_CXX11').not_()))
|
||||
#tests.append(extension_test('auto_ptr',
|
||||
# condition=set.define.contains('HAS_CXX11')))
|
||||
|
||||
import_ = binary('import_', ['import_.cpp', src.bpl], features=features|python_libs)
|
||||
if platform.os == 'Windows':
|
||||
|
||||
@@ -17,7 +17,7 @@ typedef test_class<> X;
|
||||
|
||||
X* empty() { return new X(1000); }
|
||||
|
||||
std::auto_ptr<X> sum(int a, int b) { return std::auto_ptr<X>(new X(a+b)); }
|
||||
std::shared_ptr<X> sum(int a, int b) { return std::shared_ptr<X>(new X(a+b)); }
|
||||
|
||||
boost::shared_ptr<X> product(int a, int b, int c)
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
@@ -15,7 +15,7 @@ if (sys.version_info.major >= 3):
|
||||
class DtypeTestCase(unittest.TestCase):
|
||||
|
||||
def assertEquivalent(self, a, b):
|
||||
return self.assert_(dtype_ext.equivalent(a, b), "%r is not equivalent to %r")
|
||||
return self.assertTrue(dtype_ext.equivalent(a, b), "%r is not equivalent to %r")
|
||||
|
||||
def testIntegers(self):
|
||||
for bits in (8, 16, 32, 64):
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
@@ -19,7 +19,7 @@ class TestNdarray(unittest.TestCase):
|
||||
a1 = ndarray_ext.zeros(shape,dt)
|
||||
a2 = v.reshape(a1.shape)
|
||||
self.assertEqual(shape,a1.shape)
|
||||
self.assert_((a1 == a2).all())
|
||||
self.assertTrue((a1 == a2).all())
|
||||
|
||||
def testNdzeros_matrix(self):
|
||||
for dtp in (numpy.int16, numpy.int32, numpy.float32, numpy.complex128):
|
||||
@@ -28,7 +28,7 @@ class TestNdarray(unittest.TestCase):
|
||||
a1 = ndarray_ext.zeros_matrix(shape, dt)
|
||||
a2 = numpy.matrix(numpy.zeros(shape, dtype=dtp))
|
||||
self.assertEqual(shape,a1.shape)
|
||||
self.assert_((a1 == a2).all())
|
||||
self.assertTrue((a1 == a2).all())
|
||||
self.assertEqual(type(a1), type(a2))
|
||||
|
||||
def testNdarray(self):
|
||||
@@ -38,8 +38,8 @@ class TestNdarray(unittest.TestCase):
|
||||
dt = numpy.dtype(dtp)
|
||||
a1 = ndarray_ext.array(a)
|
||||
a2 = ndarray_ext.array(a,dt)
|
||||
self.assert_((a1 == v).all())
|
||||
self.assert_((a2 == v).all())
|
||||
self.assertTrue((a1 == v).all())
|
||||
self.assertTrue((a2 == v).all())
|
||||
for shape in ((60,),(6,10),(4,3,5),(2,2,3,5)):
|
||||
a1 = a1.reshape(shape)
|
||||
self.assertEqual(shape,a1.shape)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
@@ -18,7 +18,7 @@ class TestTemplates(unittest.TestCase):
|
||||
a1 = numpy.zeros(shape, dtype=dtype)
|
||||
a2 = v.reshape(a1.shape)
|
||||
templates_ext.fill(a1)
|
||||
self.assert_((a1 == a2).all())
|
||||
self.assertTrue((a1 == a2).all())
|
||||
a1 = numpy.zeros((12,), dtype=numpy.float64)
|
||||
self.assertRaises(TypeError, templates_ext.fill, a1)
|
||||
a1 = numpy.zeros((12,2,3), dtype=numpy.float32)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright Jim Bosch & Ankit Daftery 2010-2012.
|
||||
# Distributed under the Boost Software License, Version 1.0.
|
||||
@@ -8,7 +8,10 @@
|
||||
import ufunc_ext
|
||||
import unittest
|
||||
import numpy
|
||||
from numpy.testing.utils import assert_array_almost_equal
|
||||
try:
|
||||
from numpy.testing import assert_array_almost_equal
|
||||
except ImportError:
|
||||
from numpy.testing.utils import assert_array_almost_equal
|
||||
|
||||
class TestUnary(unittest.TestCase):
|
||||
|
||||
@@ -24,7 +27,7 @@ class TestUnary(unittest.TestCase):
|
||||
assert_array_almost_equal(b, a*2.0)
|
||||
c = numpy.zeros(5, dtype=float)
|
||||
d = f(a,output=c)
|
||||
self.assert_(c is d)
|
||||
self.assertTrue((c == d).all())
|
||||
assert_array_almost_equal(d, a*2.0)
|
||||
|
||||
def testList(self):
|
||||
@@ -47,7 +50,7 @@ class TestBinary(unittest.TestCase):
|
||||
assert_array_almost_equal(f(a,b), (a*2+b*3))
|
||||
c = numpy.zeros(5, dtype=float)
|
||||
d = f(a,b,output=c)
|
||||
self.assert_(c is d)
|
||||
self.assertTrue((c == d).all())
|
||||
assert_array_almost_equal(d, a*2 + b*3)
|
||||
assert_array_almost_equal(f(a, 2.0), a*2 + 6.0)
|
||||
assert_array_almost_equal(f(1.0, b), 2.0 + b*3)
|
||||
|
||||
@@ -36,7 +36,7 @@ BOOST_PYTHON_MODULE( operators_wrapper_ext )
|
||||
;
|
||||
|
||||
scope().attr("v") = vector();
|
||||
std::auto_ptr<vector> dp(new dvector);
|
||||
register_ptr_to_python< std::auto_ptr<vector> >();
|
||||
std::shared_ptr<vector> dp(new dvector);
|
||||
register_ptr_to_python< std::shared_ptr<vector> >();
|
||||
scope().attr("d") = dp;
|
||||
}
|
||||
|
||||
@@ -9,8 +9,10 @@ r'''>>> import pickle1_ext
|
||||
1
|
||||
>>> pickle1_ext.world.__name__
|
||||
'world'
|
||||
>>> pickle1_ext.world('Hello').__reduce__()
|
||||
>>> pickle1_ext.world('Hello').__reduce__() # doctest: +PY310
|
||||
(<class 'pickle1_ext.world'>, ('Hello',))
|
||||
>>> pickle1_ext.world('Hello').__reduce__() # doctest: +PY311
|
||||
(<class 'pickle1_ext.world'>, ('Hello',), None)
|
||||
>>> wd = pickle1_ext.world('California')
|
||||
>>> pstr = pickle.dumps(wd)
|
||||
>>> wl = pickle.loads(pstr)
|
||||
@@ -31,7 +33,27 @@ def run(args = None):
|
||||
|
||||
if args is not None:
|
||||
sys.argv = args
|
||||
return doctest.testmod(sys.modules.get(__name__))
|
||||
|
||||
# > https://docs.python.org/3.11/library/pickle.html#object.__reduce__
|
||||
# object.__reduce__() returns
|
||||
# - python 3.10 or prior: a 2-element tuple
|
||||
# - python 3.11 or later: a 3-element tuple (object's state added)
|
||||
PY310 = doctest.register_optionflag("PY310")
|
||||
PY311 = doctest.register_optionflag("PY311")
|
||||
|
||||
class ConditionalChecker(doctest.OutputChecker):
|
||||
def check_output(self, want, got, optionflags):
|
||||
if (optionflags & PY311) and (sys.version_info[:2] < (3, 11)):
|
||||
return True
|
||||
if (optionflags & PY310) and (sys.version_info[:2] >= (3, 11)):
|
||||
return True
|
||||
return doctest.OutputChecker.check_output(self, want, got, optionflags)
|
||||
|
||||
runner = doctest.DocTestRunner(ConditionalChecker())
|
||||
for test in doctest.DocTestFinder().find(sys.modules.get(__name__)):
|
||||
runner.run(test)
|
||||
|
||||
return doctest.TestResults(runner.failures, runner.tries)
|
||||
|
||||
if __name__ == '__main__':
|
||||
print("running...")
|
||||
|
||||
@@ -12,8 +12,10 @@ r'''>>> import pickle4_ext
|
||||
1
|
||||
>>> pickle4_ext.world.__name__
|
||||
'world'
|
||||
>>> pickle4_ext.world('Hello').__reduce__()
|
||||
>>> pickle4_ext.world('Hello').__reduce__() # doctest: +PY310
|
||||
(<class 'pickle4_ext.world'>, ('Hello',))
|
||||
>>> pickle4_ext.world('Hello').__reduce__() # doctest: +PY311
|
||||
(<class 'pickle4_ext.world'>, ('Hello',), None)
|
||||
>>> wd = pickle4_ext.world('California')
|
||||
>>> pstr = pickle.dumps(wd)
|
||||
>>> wl = pickle.loads(pstr)
|
||||
@@ -29,7 +31,27 @@ def run(args = None):
|
||||
|
||||
if args is not None:
|
||||
sys.argv = args
|
||||
return doctest.testmod(sys.modules.get(__name__))
|
||||
|
||||
# > https://docs.python.org/3.11/library/pickle.html#object.__reduce__
|
||||
# object.__reduce__() returns
|
||||
# - python 3.10 or prior: a 2-element tuple
|
||||
# - python 3.11 or later: a 3-element tuple (object's state added)
|
||||
PY310 = doctest.register_optionflag("PY310")
|
||||
PY311 = doctest.register_optionflag("PY311")
|
||||
|
||||
class ConditionalChecker(doctest.OutputChecker):
|
||||
def check_output(self, want, got, optionflags):
|
||||
if (optionflags & PY311) and (sys.version_info[:2] < (3, 11)):
|
||||
return True
|
||||
if (optionflags & PY310) and (sys.version_info[:2] >= (3, 11)):
|
||||
return True
|
||||
return doctest.OutputChecker.check_output(self, want, got, optionflags)
|
||||
|
||||
runner = doctest.DocTestRunner(ConditionalChecker())
|
||||
for test in doctest.DocTestFinder().find(sys.modules.get(__name__)):
|
||||
runner.run(test)
|
||||
|
||||
return doctest.TestResults(runner.failures, runner.tries)
|
||||
|
||||
if __name__ == '__main__':
|
||||
print("running...")
|
||||
|
||||
@@ -56,11 +56,10 @@ class instance count from object:
|
||||
1
|
||||
|
||||
as expected you can't assign new value to read only property
|
||||
>>> x1.value_r = 2
|
||||
>>> x1.value_r = 2 # doctest: +ELLIPSIS
|
||||
Traceback (most recent call last):
|
||||
File "properties.py", line 49, in ?
|
||||
x1.value_r = 2
|
||||
AttributeError: can't set attribute
|
||||
...
|
||||
AttributeError: ...
|
||||
|
||||
setting value_rw to 2. value_direct:
|
||||
>>> x1.value_rw = 2
|
||||
|
||||
@@ -62,14 +62,14 @@ int test_main(int, char * [])
|
||||
assert_holder<Base,Derived
|
||||
,value_holder_back_reference<Base,Derived> >();
|
||||
|
||||
assert_holder<Base,std::auto_ptr<Base>
|
||||
,pointer_holder<std::auto_ptr<Base>,Base> >();
|
||||
assert_holder<Base,std::unique_ptr<Base>
|
||||
,pointer_holder<std::unique_ptr<Base>,Base> >();
|
||||
|
||||
assert_holder<Base,std::auto_ptr<Derived>
|
||||
,pointer_holder_back_reference<std::auto_ptr<Derived>,Base> >();
|
||||
assert_holder<Base,std::unique_ptr<Derived>
|
||||
,pointer_holder_back_reference<std::unique_ptr<Derived>,Base> >();
|
||||
|
||||
assert_holder<BR,std::auto_ptr<BR>
|
||||
,pointer_holder_back_reference<std::auto_ptr<BR>,BR> > ();
|
||||
assert_holder<BR,std::unique_ptr<BR>
|
||||
,pointer_holder_back_reference<std::unique_ptr<BR>,BR> > ();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
12
|
||||
>>> try: modify(p)
|
||||
... except TypeError: pass
|
||||
... else: 'print(expected a TypeError)'
|
||||
... else: print('expected a TypeError')
|
||||
>>> look(None)
|
||||
-1
|
||||
>>> store(p)
|
||||
@@ -61,7 +61,7 @@ bye
|
||||
13
|
||||
>>> try: modify(z)
|
||||
... except TypeError: pass
|
||||
... else: 'print(expected a TypeError)'
|
||||
... else: print('expected a TypeError')
|
||||
|
||||
>>> Z.get() # should be None
|
||||
>>> store(z)
|
||||
@@ -84,7 +84,7 @@ bye
|
||||
17
|
||||
>>> try: modify(x)
|
||||
... except TypeError: pass
|
||||
... else: 'print(expected a TypeError)'
|
||||
... else: print('expected a TypeError')
|
||||
>>> look(None)
|
||||
-1
|
||||
>>> store(x)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Copyright David Abrahams 2004. Distributed under the Boost
|
||||
# Software License, Version 1.0. (See accompanying
|
||||
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python3
|
||||
|
||||
from cltree import basic,symbol,constant,variable
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ int main()
|
||||
{
|
||||
PyTypeObject o;
|
||||
Y y;
|
||||
BOOST_TEST(&Py_REFCNT(boost::python::upcast<PyObject>(&o)) == &Py_REFCNT(&o));
|
||||
BOOST_TEST(&Py_REFCNT(boost::python::upcast<PyObject>(&y)) == &Py_REFCNT(&y));
|
||||
BOOST_TEST(boost::python::upcast<PyObject>(&o) == reinterpret_cast<PyObject*>(&o));
|
||||
BOOST_TEST(boost::python::upcast<PyObject>(&y) == &y);
|
||||
return boost::report_errors();
|
||||
}
|
||||
|
||||
@@ -20,12 +20,12 @@ struct data
|
||||
}
|
||||
};
|
||||
|
||||
std::auto_ptr<data> create_data()
|
||||
std::shared_ptr<data> create_data()
|
||||
{
|
||||
return std::auto_ptr<data>( new data );
|
||||
return std::shared_ptr<data>( new data );
|
||||
}
|
||||
|
||||
void do_nothing( std::auto_ptr<data>& ){}
|
||||
void do_nothing( std::shared_ptr<data>& ){}
|
||||
|
||||
|
||||
namespace bp = boost::python;
|
||||
@@ -59,7 +59,7 @@ struct data_wrapper : data, bp::wrapper< data >
|
||||
|
||||
BOOST_PYTHON_MODULE(wrapper_held_type_ext)
|
||||
{
|
||||
bp::class_< data_wrapper, std::auto_ptr< data > >( "data" )
|
||||
bp::class_< data_wrapper, std::shared_ptr< data > >( "data" )
|
||||
.def( "id", &data::id, &::data_wrapper::default_id );
|
||||
|
||||
bp::def( "do_nothing", &do_nothing );
|
||||
|
||||
Reference in New Issue
Block a user