2
0
mirror of https://github.com/boostorg/python.git synced 2026-01-20 04:42:28 +00:00

Compare commits

...

8 Commits

Author SHA1 Message Date
Abhay Kumar
97402f7925 🐛 Fix broken link to Jamroot in example docs 2025-11-03 10:14:34 -05:00
Anton Gladky
668bc7c106 Include missing header boost/type_traits/is_unsigned.hpp
During the Debian Packaging of new version it was found that
this header is missing during the rebuild with GCC-15.
2025-11-03 10:13:40 -05:00
Eisuke Kawashima
5f5f38fa8a fix: fix quotation 2025-11-03 09:30:32 -05:00
Stefan Seefeld
cc873d9682 Fix documentation build error. 2025-11-03 08:40:38 -05:00
Stefan Seefeld
20de46cd0c Update faber 2025-11-03 08:40:38 -05:00
Stefan Seefeld
5d7b9a0648 Stop testing c++98 support 2025-11-03 08:40:38 -05:00
Tom Kent
608ec27c4d Updated to recent compilers/boost 2025-11-03 08:40:38 -05:00
Stefan Seefeld
7fd39323ac Don't rely on Py_REFCNT to test upcast. 2025-11-03 08:40:38 -05:00
15 changed files with 37 additions and 30 deletions

View File

@@ -11,16 +11,16 @@ jobs:
matrix: matrix:
python: [python, python3] python: [python, python3]
cxx: [g++, clang++] cxx: [g++, clang++]
std: [c++98, c++11, c++14, c++17] std: [c++11, c++14, c++17]
include: include:
# Add the appropriate docker image for each compiler. # Add the appropriate docker image for each compiler.
# The images from teeks99/boost-python-test already have boost::python # The images from teeks99/boost-python-test already have boost::python
# pre-reqs installed, see: # pre-reqs installed, see:
# https://github.com/teeks99/boost-python-test-docker # https://github.com/teeks99/boost-python-test-docker
- cxx: clang++ - 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++ - 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: container:
image: ${{ matrix.docker-img }} image: ${{ matrix.docker-img }}
@@ -28,6 +28,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v5 - 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 - name: build
run: | run: |
${{ matrix.python }} --version ${{ matrix.python }} --version

View File

@@ -90,7 +90,7 @@
<tr> <tr>
<td valign="top" width="300"> <td valign="top" width="300">
<h3><a href="{{ pathto('index') }}"><img <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>
<td > <td >

View File

@@ -117,7 +117,7 @@ platforms. The complete list of Bjam executables can be found
[h2 Let's Jam!] [h2 Let's Jam!]
__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 file. Simply copy the file and tweak [^use-project boost] to where your
boost root directory is and you're OK. boost root directory is and you're OK.

View File

@@ -16,6 +16,7 @@ from faber.config.try_run import try_run
features += include('include') features += include('include')
features += define('BOOST_ALL_NO_LIB') # disable auto-linking features += define('BOOST_ALL_NO_LIB') # disable auto-linking
features += define('BOOST_NO_AUTO_PTR')
boost_include = options.get_with('boost-include') boost_include = options.get_with('boost-include')
if boost_include: if boost_include:
features += include(boost_include) features += include(boost_include)

View File

@@ -8,6 +8,8 @@
# ifndef BOOST_NO_AUTO_PTR # ifndef BOOST_NO_AUTO_PTR
# include <boost/python/detail/is_xxx.hpp> # include <boost/python/detail/is_xxx.hpp>
# include <memory> # include <memory>
# else
# include <boost/mpl/bool.hpp>
# endif # endif
namespace boost { namespace python { namespace detail { namespace boost { namespace python { namespace detail {

View File

@@ -17,6 +17,7 @@
#include <boost/python/numpy/numpy_object_mgr_traits.hpp> #include <boost/python/numpy/numpy_object_mgr_traits.hpp>
#include <boost/mpl/for_each.hpp> #include <boost/mpl/for_each.hpp>
#include <boost/python/detail/type_traits.hpp> #include <boost/python/detail/type_traits.hpp>
#include <boost/type_traits/is_unsigned.hpp>
namespace boost { namespace python { namespace numpy { namespace boost { namespace python { namespace numpy {

View File

@@ -99,7 +99,7 @@ BOOST_PYTHON_MODULE(back_reference_ext)
.def("set", &Y::set) .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("value", &Z::value)
.def("set", &Z::set) .def("set", &Z::set)
; ;

View File

@@ -9,14 +9,13 @@
struct foo struct foo
{ {
operator std::auto_ptr<int>&() const; operator std::shared_ptr<int>&() const;
}; };
int main() int main()
{ {
using namespace boost::python::detail; using namespace boost::python::detail;
BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<int>::value); 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<std::string>::value);
BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<foo>::value); BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<foo>::value);
return 0; return 0;

View File

@@ -118,10 +118,10 @@ for t in [('injected',),
tests.append(extension_test('shared_ptr', tests.append(extension_test('shared_ptr',
condition=set.define.contains('HAS_CXX11'))) condition=set.define.contains('HAS_CXX11')))
tests.append(extension_test('polymorphism2_auto_ptr', #tests.append(extension_test('polymorphism2_auto_ptr',
condition=set.define.contains('HAS_CXX11').not_())) # condition=set.define.contains('HAS_CXX11').not_()))
tests.append(extension_test('auto_ptr', #tests.append(extension_test('auto_ptr',
condition=set.define.contains('HAS_CXX11'))) # condition=set.define.contains('HAS_CXX11')))
import_ = binary('import_', ['import_.cpp', src.bpl], features=features|python_libs) import_ = binary('import_', ['import_.cpp', src.bpl], features=features|python_libs)
if platform.os == 'Windows': if platform.os == 'Windows':

View File

@@ -17,7 +17,7 @@ typedef test_class<> X;
X* empty() { return new X(1000); } 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) boost::shared_ptr<X> product(int a, int b, int c)
{ {

View File

@@ -36,7 +36,7 @@ BOOST_PYTHON_MODULE( operators_wrapper_ext )
; ;
scope().attr("v") = vector(); scope().attr("v") = vector();
std::auto_ptr<vector> dp(new dvector); std::shared_ptr<vector> dp(new dvector);
register_ptr_to_python< std::auto_ptr<vector> >(); register_ptr_to_python< std::shared_ptr<vector> >();
scope().attr("d") = dp; scope().attr("d") = dp;
} }

View File

@@ -62,14 +62,14 @@ int test_main(int, char * [])
assert_holder<Base,Derived assert_holder<Base,Derived
,value_holder_back_reference<Base,Derived> >(); ,value_holder_back_reference<Base,Derived> >();
assert_holder<Base,std::auto_ptr<Base> assert_holder<Base,std::unique_ptr<Base>
,pointer_holder<std::auto_ptr<Base>,Base> >(); ,pointer_holder<std::unique_ptr<Base>,Base> >();
assert_holder<Base,std::auto_ptr<Derived> assert_holder<Base,std::unique_ptr<Derived>
,pointer_holder_back_reference<std::auto_ptr<Derived>,Base> >(); ,pointer_holder_back_reference<std::unique_ptr<Derived>,Base> >();
assert_holder<BR,std::auto_ptr<BR> assert_holder<BR,std::unique_ptr<BR>
,pointer_holder_back_reference<std::auto_ptr<BR>,BR> > (); ,pointer_holder_back_reference<std::unique_ptr<BR>,BR> > ();
return 0; return 0;
} }

View File

@@ -38,7 +38,7 @@
12 12
>>> try: modify(p) >>> try: modify(p)
... except TypeError: pass ... except TypeError: pass
... else: 'print(expected a TypeError)' ... else: print('expected a TypeError')
>>> look(None) >>> look(None)
-1 -1
>>> store(p) >>> store(p)
@@ -61,7 +61,7 @@ bye
13 13
>>> try: modify(z) >>> try: modify(z)
... except TypeError: pass ... except TypeError: pass
... else: 'print(expected a TypeError)' ... else: print('expected a TypeError')
>>> Z.get() # should be None >>> Z.get() # should be None
>>> store(z) >>> store(z)
@@ -84,7 +84,7 @@ bye
17 17
>>> try: modify(x) >>> try: modify(x)
... except TypeError: pass ... except TypeError: pass
... else: 'print(expected a TypeError)' ... else: print('expected a TypeError')
>>> look(None) >>> look(None)
-1 -1
>>> store(x) >>> store(x)

View File

@@ -13,7 +13,7 @@ int main()
{ {
PyTypeObject o; PyTypeObject o;
Y y; Y y;
BOOST_TEST(&Py_REFCNT(boost::python::upcast<PyObject>(&o)) == &Py_REFCNT(&o)); BOOST_TEST(boost::python::upcast<PyObject>(&o) == reinterpret_cast<PyObject*>(&o));
BOOST_TEST(&Py_REFCNT(boost::python::upcast<PyObject>(&y)) == &Py_REFCNT(&y)); BOOST_TEST(boost::python::upcast<PyObject>(&y) == &y);
return boost::report_errors(); return boost::report_errors();
} }

View File

@@ -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; namespace bp = boost::python;
@@ -59,7 +59,7 @@ struct data_wrapper : data, bp::wrapper< data >
BOOST_PYTHON_MODULE(wrapper_held_type_ext) 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 ); .def( "id", &data::id, &::data_wrapper::default_id );
bp::def( "do_nothing", &do_nothing ); bp::def( "do_nothing", &do_nothing );