Refine test matrix generation.

Py_REFCNT was stabilized in 3.9, uses this official API instead of the
`ob_refcnt` field that doesn't exist in the free-threaded build of 3.13.

.github/workflows/deploy-documentation.yml

@@ -1,37 +0,0 @@
-name: deploy documentation
-
-on: [push]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: setup
-      run: |
-        sudo apt-get update
-        sudo apt-get install \
-          libboost1.71-tools-dev \
-          python3 \
-          python3-numpy \
-          python3-sphinx \
-          xsltproc \
-          docbook-xsl
-        sudo python3 -m pip install --upgrade pip
-        sudo python3 -m pip install faber
-    - name: build
-      run: |
-        sed -e "s/\$PYTHON/python3/g" .ci/faber > ~/.faber
-        faber --builddir=build doc.html
-        if [ "${GITHUB_REF##*/}" == master ]; then
-          echo "destination_dir=doc/html" >> $GITHUB_ENV
-        else
-          echo "destination_dir=doc/develop/html" >> $GITHUB_ENV
-        fi
-    - name: deploy
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: build/doc/html
-        destination_dir: ${{ env.destination_dir }}
-        keep_files: true

.github/workflows/test-osx.yml

@@ -1,48 +0,0 @@
-name: Test OSX
-
-on:  [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macOS-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [3.8.10]
-        cxx: [clang++]
-        std: [c++11, c++14] # TODO: c++17 is failing !
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: setup python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: setup prerequisites
-      run: |
-        brew install boost
-        python -m pip install --upgrade pip
-        python -m pip install setuptools faber
-    - name: build
-      run: |
-        python --version
-        ${{ matrix.cxx }} --version
-        brew info boost
-        faber -v
-        sed -e "s/\$PYTHON/python/g" .ci/faber > ~/.faber
-        faber \
-          --with-boost-include=/opt/homebrew/Cellar/boost/1.86.0/include \
-          --builddir=build \
-          cxx.name=${{ matrix.cxx }} \
-          cxxflags=-std=${{ matrix.std }} \
-          -j`sysctl -n hw.ncpu`
-    - name: test
-      run: |
-        faber \
-          --with-boost-include=/opt/homebrew/Cellar/boost/1.86.0/include \
-          --builddir=build\
-          cxx.name=${{ matrix.cxx }} \
-          cxxflags=-std=${{ matrix.std }} \
-          -j`sysctl -n hw.ncpu` \
-          test.report

.github/workflows/test-ubuntu.yml

@@ -9,9 +9,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: [python, python3]
+        python-version: [2.7, 3.9, 3.10, 3.11, 3.12, 3.13, 3.14, 3.14t]
         cxx: [g++, clang++]
-        std: [c++98, c++11, c++14, c++17]
+        #cxx: [g++]
+        #std: [c++98, c++11, c++14, c++17]
+        #std: [c++17]
         include:
           # Add the appropriate docker image for each compiler.
           # The images from teeks99/boost-python-test already have boost::python
@@ -21,31 +23,28 @@ jobs:
             docker-img: teeks99/boost-python-test:clang-12_1.76.0
           - cxx: g++
             docker-img: teeks99/boost-python-test:gcc-10_1.76.0
+          # by default, all builds use -std=c++17
+          - std: c++17
+          # expand test coverage for python 2.7
+          - python-version: 2.7
+            std: c++98
+          - python-version: 2.7
+            std: c++11
+          - python-version: 2.7
+            std: c++14
 
     container:
       image: ${{ matrix.docker-img }}
 
     steps:
-    - uses: actions/checkout@v4
-
+    - uses: actions/checkout@v5
+    - name: setup python
+      if: "${{ matrix.python-version  != '2.7' }}"
+      uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.python-version }}
     - name: build
       run: |
-        ${{ matrix.python }} --version
+        echo ${{ matrix.python-version }} ${{ matrix.cxx }} ${{ matrix.std }}
+        python --version
         ${{ matrix.cxx }} --version
-        faber -v
-        sed -e "s/\$PYTHON/${{ matrix.python }}/g" .ci/faber > ~/.faber
-        faber \
-          --with-boost-include=${BOOST_PY_DEPS} \
-          --builddir=build \
-          cxx.name=${{ matrix.cxx }} \
-          cxxflags=-std=${{ matrix.std }} \
-          -j`nproc`
-    - name: test
-      run: |
-        faber \
-          --with-boost-include=${BOOST_PY_DEPS} \
-          --builddir=build \
-          cxx.name=${{ matrix.cxx }} \
-          cxxflags=-std=${{ matrix.std }} \
-          -j`nproc` \
-          test.report

.github/workflows/test-windows.yml

@@ -1,49 +0,0 @@
-name: Test Windows
-
-on:  [push, pull_request]
-
-jobs:
-  build:
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [3.7]
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-    - uses: microsoft/setup-msbuild@v1.1
-    - name: setup boost prerequisites
-      uses: lukka/run-vcpkg@v6
-      with:
-        vcpkgGitCommitId: '88b1071e39f13b632644d9d953738d345a4ac055'
-        vcpkgDirectory: '${{ runner.workspace }}/vcpkg'
-        vcpkgTriplet: x64-windows
-        vcpkgArguments: >
-          boost-config
-          boost-core
-          boost-function
-          boost-graph
-          boost-iterator
-          boost-lexical-cast
-          boost-mpl
-          boost-preprocessor
-          boost-smart-ptr
-          boost-static-assert
-          boost-align
-    - name: setup faber
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install setuptools faber numpy
-        faber --info=tools cxx
-    - name: build
-      shell: cmd
-      run: |
-        faber --builddir=build cxx.name=msvc --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

doc/numpy/conf.py

@@ -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)
 ]

example/numpy/demo_gaussian.py

@@ -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))

example/quickstart/script.py

@@ -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)

example/quickstart/test_extending.py

@@ -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)

example/tutorial/hello.py

@@ -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)

include/boost/python/suite/indexing/detail/indexing_suite_detail.hpp

@@ -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");

src/converter/from_python.cpp

@@ -222,7 +222,13 @@ namespace
       , char const* ref_type)
   {
       handle<> holder(source);
-      if (source->ob_refcnt <= 1)
+      if (
+#if PY_VERSION_HEX < 0x03090000
+                source->ob_refcnt
+#else
+                Py_REFCNT(source)
+#endif
+                <= 1)
       {
           handle<> msg(
 #if PY_VERSION_HEX >= 0x3000000

test/numpy/dtype.py

@@ -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):

test/numpy/indexing.py

@@ -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.

test/numpy/ndarray.py

@@ -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)

test/numpy/shapes.py

@@ -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.

test/numpy/templates.py

@@ -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)

test/numpy/ufunc.py

@@ -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) 

test/test_cltree.py

@@ -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