Add comments explaining the stage/install targets in build/Jamfile

.appveyor.yml

@@ -0,0 +1,103 @@
+environment:
+  global:
+    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
+    # /E:ON and /V:ON options are not enabled in the batch script intepreter
+    # See: http://stackoverflow.com/a/13751649/163740
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\run_with_env.cmd"
+    BOOST_PREFIX: C:\Libraries\boost_1_66_0
+
+  matrix:
+
+    # Pre-installed Python versions, which Appveyor may upgrade to
+    # a later point release.
+    # See: http://www.appveyor.com/docs/installed-software#python
+
+    - PYTHON: "C:\\Python27"
+      PYTHON_VERSION: "2.7.x" # currently 2.7.9
+      PYTHON_ARCH: "32"
+      MSVC: "14.0"
+      ARCH: x86
+
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6.x"
+      PYTHON_ARCH: "64"
+      MSVC: "12.0"
+      ARCH: x86_64
+
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6.x"
+      PYTHON_ARCH: "64"
+      MSVC: "14.13.26128"
+      ARCH: x86_64
+
+install:
+  # If there is a newer build queued for the same PR, cancel this one.
+  # The AppVeyor 'rollout builds' option is supposed to serve the same
+  # purpose but it is problematic because it tends to cancel builds pushed
+  # directly to master instead of just PR builds (or the converse).
+  # credits: JuliaLang developers.
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+          throw "There are newer queued builds for this pull request, failing early." }
+  - ECHO "Filesystem root:"
+  - ps: "ls \"C:/\""
+  - ECHO "Installed libraries:"
+  - ps: "ls \"C:/Libraries/\""
+  ## This path doesn't exist with the VS 2017 worker images
+  #- ECHO "Installed SDKs:"
+  #- ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
+
+  # Install Python (from the official .msi of http://python.org) and pip when
+  # not already installed.
+  - ps: if (-not(Test-Path($env:PYTHON))) { & .ci\install.ps1 }
+
+  # Prepend newly installed Python to the PATH of this build (this cannot be
+  # done from inside the powershell script as it would require to restart
+  # the parent CMD process).
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+
+  # Check that we have the expected version and architecture for Python
+  - "python --version"
+  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+
+  # Upgrade to the latest version of pip to avoid it displaying warnings
+  # about it being out of date.
+  - "pip install --disable-pip-version-check --user --upgrade pip"
+
+  # Install the build dependencies of the project. If some dependencies contain
+  # compiled extensions and are not provided as pre-built wheel packages,
+  # pip will build them from source using the MSVC compiler matching the
+  # target Python version and architecture
+  - |
+     curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/snapshot/2018-04-08.tar.gz
+     tar xf faber.tar.gz
+     CD faber-snapshot-2018-04-08
+     python setup.py install
+     CD ..
+  # report the available MSVC compilers
+  - faber --info=tools cxx
+  - easy_install sphinx
+  - pip install numpy
+
+build_script:
+  - faber --with-boost-include=%BOOST_PREFIX% target.arch=%ARCH% msvc.version=%MSVC%
+
+test_script:
+  - faber --with-boost-include=%BOOST_PREFIX% test.report target.arch=%ARCH% msvc.version=%MSVC%
+
+after_test:
+  # If tests are successful, create binary packages for the project.
+  #- "%CMD_IN_ENV% python setup.py bdist_wheel"
+  #- "%CMD_IN_ENV% python setup.py bdist_wininst"
+  #- "%CMD_IN_ENV% python setup.py bdist_msi"
+  #- ps: "ls dist"
+
+#artifacts:
+  # Archive the generated packages in the ci.appveyor.com build report.
+  #- path: dist\*
+
+#on_success:
+#  - TODO: upload the content of dist/*.whl to a public wheelhouse
+#

.ci/faber

@@ -1,7 +1,3 @@
-# -*- python -*-
-
-from faber.tools.boost import boostbook
 from faber.tools.python import python
 
-bb = boostbook(prefix='/usr/share/boostbook')
 p = python(command='$PYTHON')

.ci/install.ps1

@@ -0,0 +1,229 @@
+# Sample script to install Python and pip under Windows
+# Authors: Olivier Grisel, Jonathan Helmus, Kyle Kastner, and Alex Willmer
+# License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+
+$MINICONDA_URL = "http://repo.continuum.io/miniconda/"
+$BASE_URL = "https://www.python.org/ftp/python/"
+$GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
+$GET_PIP_PATH = "C:\get-pip.py"
+
+$PYTHON_PRERELEASE_REGEX = @"
+(?x)
+(?<major>\d+)
+\.
+(?<minor>\d+)
+\.
+(?<micro>\d+)
+(?<prerelease>[a-z]{1,2}\d+)
+"@
+
+
+function Download ($filename, $url) {
+    $webclient = New-Object System.Net.WebClient
+
+    $basedir = $pwd.Path + "\"
+    $filepath = $basedir + $filename
+    if (Test-Path $filename) {
+        Write-Host "Reusing" $filepath
+        return $filepath
+    }
+
+    # Download and retry up to 3 times in case of network transient errors.
+    Write-Host "Downloading" $filename "from" $url
+    $retry_attempts = 2
+    for ($i = 0; $i -lt $retry_attempts; $i++) {
+        try {
+            $webclient.DownloadFile($url, $filepath)
+            break
+        }
+        Catch [Exception]{
+            Start-Sleep 1
+        }
+    }
+    if (Test-Path $filepath) {
+        Write-Host "File saved at" $filepath
+    } else {
+        # Retry once to get the error message if any at the last try
+        $webclient.DownloadFile($url, $filepath)
+    }
+    return $filepath
+}
+
+
+function ParsePythonVersion ($python_version) {
+    if ($python_version -match $PYTHON_PRERELEASE_REGEX) {
+        return ([int]$matches.major, [int]$matches.minor, [int]$matches.micro,
+                $matches.prerelease)
+    }
+    $version_obj = [version]$python_version
+    return ($version_obj.major, $version_obj.minor, $version_obj.build, "")
+}
+
+
+function DownloadPython ($python_version, $platform_suffix) {
+    $major, $minor, $micro, $prerelease = ParsePythonVersion $python_version
+
+    if (($major -le 2 -and $micro -eq 0) `
+        -or ($major -eq 3 -and $minor -le 2 -and $micro -eq 0) `
+        ) {
+        $dir = "$major.$minor"
+        $python_version = "$major.$minor$prerelease"
+    } else {
+        $dir = "$major.$minor.$micro"
+    }
+
+    if ($prerelease) {
+        if (($major -le 2) `
+            -or ($major -eq 3 -and $minor -eq 1) `
+            -or ($major -eq 3 -and $minor -eq 2) `
+            -or ($major -eq 3 -and $minor -eq 3) `
+            ) {
+            $dir = "$dir/prev"
+        }
+    }
+
+    if (($major -le 2) -or ($major -le 3 -and $minor -le 4)) {
+        $ext = "msi"
+        if ($platform_suffix) {
+            $platform_suffix = ".$platform_suffix"
+        }
+    } else {
+        $ext = "exe"
+        if ($platform_suffix) {
+            $platform_suffix = "-$platform_suffix"
+        }
+    }
+
+    $filename = "python-$python_version$platform_suffix.$ext"
+    $url = "$BASE_URL$dir/$filename"
+    $filepath = Download $filename $url
+    return $filepath
+}
+
+
+function InstallPython ($python_version, $architecture, $python_home) {
+    Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home
+    if (Test-Path $python_home) {
+        Write-Host $python_home "already exists, skipping."
+        return $false
+    }
+    if ($architecture -eq "32") {
+        $platform_suffix = ""
+    } else {
+        $platform_suffix = "amd64"
+    }
+    $installer_path = DownloadPython $python_version $platform_suffix
+    $installer_ext = [System.IO.Path]::GetExtension($installer_path)
+    Write-Host "Installing $installer_path to $python_home"
+    $install_log = $python_home + ".log"
+    if ($installer_ext -eq '.msi') {
+        InstallPythonMSI $installer_path $python_home $install_log
+    } else {
+        InstallPythonEXE $installer_path $python_home $install_log
+    }
+    if (Test-Path $python_home) {
+        Write-Host "Python $python_version ($architecture) installation complete"
+    } else {
+        Write-Host "Failed to install Python in $python_home"
+        Get-Content -Path $install_log
+        Exit 1
+    }
+}
+
+
+function InstallPythonEXE ($exepath, $python_home, $install_log) {
+    $install_args = "/quiet InstallAllUsers=1 TargetDir=$python_home"
+    RunCommand $exepath $install_args
+}
+
+
+function InstallPythonMSI ($msipath, $python_home, $install_log) {
+    $install_args = "/qn /log $install_log /i $msipath TARGETDIR=$python_home"
+    $uninstall_args = "/qn /x $msipath"
+    RunCommand "msiexec.exe" $install_args
+    if (-not(Test-Path $python_home)) {
+        Write-Host "Python seems to be installed else-where, reinstalling."
+        RunCommand "msiexec.exe" $uninstall_args
+        RunCommand "msiexec.exe" $install_args
+    }
+}
+
+function RunCommand ($command, $command_args) {
+    Write-Host $command $command_args
+    Start-Process -FilePath $command -ArgumentList $command_args -Wait -Passthru
+}
+
+
+function InstallPip ($python_home) {
+    $pip_path = $python_home + "\Scripts\pip.exe"
+    $python_path = $python_home + "\python.exe"
+    if (-not(Test-Path $pip_path)) {
+        Write-Host "Installing pip..."
+        $webclient = New-Object System.Net.WebClient
+        $webclient.DownloadFile($GET_PIP_URL, $GET_PIP_PATH)
+        Write-Host "Executing:" $python_path $GET_PIP_PATH
+        & $python_path $GET_PIP_PATH
+    } else {
+        Write-Host "pip already installed."
+    }
+}
+
+
+function DownloadMiniconda ($python_version, $platform_suffix) {
+    if ($python_version -eq "3.4") {
+        $filename = "Miniconda3-3.5.5-Windows-" + $platform_suffix + ".exe"
+    } else {
+        $filename = "Miniconda-3.5.5-Windows-" + $platform_suffix + ".exe"
+    }
+    $url = $MINICONDA_URL + $filename
+    $filepath = Download $filename $url
+    return $filepath
+}
+
+
+function InstallMiniconda ($python_version, $architecture, $python_home) {
+    Write-Host "Installing Python" $python_version "for" $architecture "bit architecture to" $python_home
+    if (Test-Path $python_home) {
+        Write-Host $python_home "already exists, skipping."
+        return $false
+    }
+    if ($architecture -eq "32") {
+        $platform_suffix = "x86"
+    } else {
+        $platform_suffix = "x86_64"
+    }
+    $filepath = DownloadMiniconda $python_version $platform_suffix
+    Write-Host "Installing" $filepath "to" $python_home
+    $install_log = $python_home + ".log"
+    $args = "/S /D=$python_home"
+    Write-Host $filepath $args
+    Start-Process -FilePath $filepath -ArgumentList $args -Wait -Passthru
+    if (Test-Path $python_home) {
+        Write-Host "Python $python_version ($architecture) installation complete"
+    } else {
+        Write-Host "Failed to install Python in $python_home"
+        Get-Content -Path $install_log
+        Exit 1
+    }
+}
+
+
+function InstallMinicondaPip ($python_home) {
+    $pip_path = $python_home + "\Scripts\pip.exe"
+    $conda_path = $python_home + "\Scripts\conda.exe"
+    if (-not(Test-Path $pip_path)) {
+        Write-Host "Installing pip..."
+        $args = "install --yes pip"
+        Write-Host $conda_path $args
+        Start-Process -FilePath "$conda_path" -ArgumentList $args -Wait -Passthru
+    } else {
+        Write-Host "pip already installed."
+    }
+}
+
+function main () {
+    InstallPython $env:PYTHON_VERSION $env:PYTHON_ARCH $env:PYTHON
+    InstallPip $env:PYTHON
+}
+
+main

.ci/run_with_env.cmd

@@ -0,0 +1,88 @@
+:: To build extensions for 64 bit Python 3, we need to configure environment
+:: variables to use the MSVC 2010 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 4 (SDK v7.1)
+::
+:: To build extensions for 64 bit Python 2, we need to configure environment
+:: variables to use the MSVC 2008 C++ compilers from GRMSDKX_EN_DVD.iso of:
+:: MS Windows SDK for Windows 7 and .NET Framework 3.5 (SDK v7.0)
+::
+:: 32 bit builds, and 64-bit builds for 3.5 and beyond, do not require specific
+:: environment configurations.
+::
+:: Note: this script needs to be run with the /E:ON and /V:ON flags for the
+:: cmd interpreter, at least for (SDK v7.0)
+::
+:: More details at:
+:: https://github.com/cython/cython/wiki/64BitCythonExtensionsOnWindows
+:: http://stackoverflow.com/a/13751649/163740
+::
+:: Author: Olivier Grisel
+:: License: CC0 1.0 Universal: http://creativecommons.org/publicdomain/zero/1.0/
+::
+:: Notes about batch files for Python people:
+::
+:: Quotes in values are literally part of the values:
+::      SET FOO="bar"
+:: FOO is now five characters long: " b a r "
+:: If you don't want quotes, don't include them on the right-hand side.
+::
+:: The CALL lines at the end of this file look redundant, but if you move them
+:: outside of the IF clauses, they do not run properly in the SET_SDK_64==Y
+:: case, I don't know why.
+@ECHO OFF
+
+SET COMMAND_TO_RUN=%*
+SET WIN_SDK_ROOT=C:\Program Files\Microsoft SDKs\Windows
+SET WIN_WDK=c:\Program Files (x86)\Windows Kits\10\Include\wdf
+
+:: Extract the major and minor versions, and allow for the minor version to be
+:: more than 9.  This requires the version number to have two dots in it.
+SET MAJOR_PYTHON_VERSION=%PYTHON_VERSION:~0,1%
+IF "%PYTHON_VERSION:~3,1%" == "." (
+    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,1%
+) ELSE (
+    SET MINOR_PYTHON_VERSION=%PYTHON_VERSION:~2,2%
+)
+
+:: Based on the Python version, determine what SDK version to use, and whether
+:: to set the SDK for 64-bit.
+IF %MAJOR_PYTHON_VERSION% == 2 (
+    SET WINDOWS_SDK_VERSION="v7.0"
+    SET SET_SDK_64=Y
+) ELSE (
+    IF %MAJOR_PYTHON_VERSION% == 3 (
+        SET WINDOWS_SDK_VERSION="v7.1"
+        IF %MINOR_PYTHON_VERSION% LEQ 4 (
+            SET SET_SDK_64=Y
+        ) ELSE (
+            SET SET_SDK_64=N
+            IF EXIST "%WIN_WDK%" (
+                :: See: https://connect.microsoft.com/VisualStudio/feedback/details/1610302/
+                REN "%WIN_WDK%" 0wdf
+            )
+        )
+    ) ELSE (
+        ECHO Unsupported Python version: "%MAJOR_PYTHON_VERSION%"
+        EXIT 1
+    )
+)
+
+IF %PYTHON_ARCH% == 64 (
+    IF %SET_SDK_64% == Y (
+        ECHO Configuring Windows SDK %WINDOWS_SDK_VERSION% for Python %MAJOR_PYTHON_VERSION% on a 64 bit architecture
+        SET DISTUTILS_USE_SDK=1
+        SET MSSdk=1
+        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Setup\WindowsSdkVer.exe" -q -version:%WINDOWS_SDK_VERSION%
+        "%WIN_SDK_ROOT%\%WINDOWS_SDK_VERSION%\Bin\SetEnv.cmd" /x64 /release
+        ECHO Executing: %COMMAND_TO_RUN%
+        call %COMMAND_TO_RUN% || EXIT 1
+    ) ELSE (
+        ECHO Using default MSVC build environment for 64 bit architecture
+        ECHO Executing: %COMMAND_TO_RUN%
+        call %COMMAND_TO_RUN% || EXIT 1
+    )
+) ELSE (
+    ECHO Using default MSVC build environment for 32 bit architecture
+    ECHO Executing: %COMMAND_TO_RUN%
+    call %COMMAND_TO_RUN% || EXIT 1
+)

.ci/upload_docs.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+set -e # Exit with nonzero exit code if anything fails
+
+SOURCE_BRANCH="master"
+TARGET_BRANCH="gh-pages"
+
+# Pull requests and commits to other branches shouldn't try to deploy, just build to verify
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] || \
+   [ "$TRAVIS_BRANCH" != master -a \
+     "$TRAVIS_BRANCH" != develop  -a \
+     "$TRAVIS_BRANCH" != travis ]; then
+    echo "No docs to upload."
+    exit 0
+fi
+
+if [ -z "$GH_TOKEN" ]; then
+    echo "Error: GH_TOKEN is undefined"
+    exit 1
+fi
+
+# Save some useful information
+REPO=`git config remote.origin.url`
+SHA=`git rev-parse --verify HEAD`
+
+# build happens to contain the "doc/html" tree that we want to push
+# into the gh-pages branch. So we step into that directory, create a new repo,
+# set the remote appropriately, then commit and push.
+cd build
+git init
+git config user.name "Travis CI"
+git config user.email "travis-ci"
+
+# Make sure 'GH_TOKEN' is set (as 'secure' variable) in .travis.yml
+git remote add upstream "https://$GH_TOKEN@github.com/boostorg/python.git"
+git fetch upstream
+git reset upstream/gh-pages
+
+# Prepare version.
+if [ "$TRAVIS_BRANCH" = develop -o "$TRAVIS_BRANCH" = travis ]; then
+    mkdir -p develop/doc/
+    cp ../index.html develop/
+    cp ../doc/index.html develop/doc/
+    cp -a doc/html develop/doc/
+    git add develop/index.html
+    git add develop/doc/index.html
+    git add -A develop/doc/html
+else
+    cp ../index.html .
+    cp ../doc/index.html doc/
+    git add index.html
+    git add doc/index.html
+    git add -A doc/html
+fi
+# Commit the new version.
+git commit -m "Deploy to GitHub Pages: ${SHA}"
+
+# Now that we're all set up, we can push.
+git push -q upstream HEAD:gh-pages

.github/workflows/deploy-documentation.yml

@@ -1,37 +0,0 @@
-name: deploy documentation
-
-on: [push, pull_request]
-
-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,45 +0,0 @@
-name: Test OSX
-
-on:  [push, pull_request]
-
-jobs:
-  build:
-    runs-on: macOS-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [3.6]
-        cxx: [clang++]
-        std: [c++98, c++11, c++14] # TODO: c++17 is failing !
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: setup python
-      uses: actions/setup-python@v2
-      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
-        faber -v
-        sed -e "s/\$PYTHON/python/g" .ci/faber > ~/.faber
-        faber \
-          --builddir=build \
-          cxx.name=${{ matrix.cxx }} \
-          cxxflags=-std=${{ matrix.std }} \
-          -j`sysctl -n hw.ncpu`
-    - name: test
-      run: |
-        faber \
-          --builddir=build\
-          cxx.name=${{ matrix.cxx }} \
-          cxxflags=-std=${{ matrix.std }} \
-          -j`sysctl -n hw.ncpu` \
-          test.report

.github/workflows/test-ubuntu.yml

@@ -1,51 +0,0 @@
-name: Test Ubuntu
-
-on:  [push, pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python: [python, python3]
-        cxx: [g++, clang++]
-        std: [c++98, 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-11_1.66.0
-          - cxx: g++
-            docker-img: teeks99/boost-python-test:gcc-9_1.66.0
-
-    container:
-      image: ${{ matrix.docker-img }}
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: build
-      run: |
-        ${{ matrix.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,39 +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@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: setup boost prerequisites
-      uses: lukka/run-vcpkg@v6
-      with:
-        vcpkgGitCommitId: '8a9a97315aefb3f8bc5d81bf66ca0025938b9c91'
-        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
-
-    - name: setup faber
-      #shell: 'bash'
-      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

.travis.yml

@@ -0,0 +1,118 @@
+#
+# Copyright (c) 2016 Stefan Seefeld
+# All rights reserved.
+#
+# 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)
+
+sudo: required
+dist: trusty
+
+language: cpp
+
+env:
+  global:
+    - secure: BRNUkxN3p8f+uYKWC3Hr0VPqZA0PxbWr1DJlcI4hbiZtzKhMCWjDmd9UW9CzzexqeOxpd+9s0G87qvOur+wMSVxugDxtTesZrh1czXHeSVxgQrYD783XJtQJ9aYypbChkiboRD6Xpmbq7itwMuHBJMFtCuDxMynpU1jWwkyTf2Y=
+
+matrix:
+  include:
+    - os: linux
+      env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++98
+    - os: linux
+      env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++11
+    - os: linux
+      env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++98
+    - os: linux
+      env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++11
+    - os: linux
+      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98
+    - os: linux
+      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11
+    - os: osx
+      env: CXX=clang++ PYTHON=python CXXFLAGS=-std=c++11
+    - env: PYTHON=python DOC=1
+  allow_failures:
+    - os: osx
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.8
+    - g++-4.8
+    - clang
+    - python-numpy
+    - python-sphinx
+    - python3-dev
+    - python3-numpy
+    - libboost-all-dev
+    - xsltproc
+    - docbook-xsl
+    - python-docutils
+
+
+cache:
+  directories:
+  - $HOME/Boost
+
+before_install:
+  # The Trusty image has several Python versions pre-installed compiled with
+  # conflicting UCS2 and UCS4 unicode. Modify the PATH to skip the TravisCI python.
+  # See https://github.com/travis-ci/travis-ci/issues/4948 for details.
+  - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
+
+install:
+  # Install our own version of Boost (the subset we need) as the system version is
+  # too old (for C++11 support).
+  - |
+     if [ ! -d $HOME/Boost/tools/boostbook ]; then
+       echo "rebuilding Boost prerequisites."
+       wget https://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.gz/download
+       tar xf download
+       pushd boost_1_66_0
+       ./bootstrap.sh
+       ./b2 tools/bcp
+       mkdir -p $HOME/Boost
+       # Install Boost.Python prerequisites, but not Boost.Python itself.
+       dist/bin/bcp python tools/boostbook tools/quickbook $HOME/Boost &> /dev/null
+       rm -rf $HOME/Boost/boost/python*
+       popd
+     else
+       echo "using cached Boost prerequisites."
+     fi
+     # Install Faber, the build tool.
+     date=2018-04-08
+     wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz
+     tar xf $date.tar.gz
+     pushd faber-snapshot-$date
+     #wget https://github.com/stefanseefeld/faber/archive/release/0.2.tar.gz
+     #tar xf 0.2.tar.gz
+     #pushd faber-release-0.2
+     sudo python setup.py install
+     popd
+
+before_script:
+- sed -e "s/\$PYTHON/$PYTHON/g" .ci/faber > ~/.faber
+- $PYTHON --version
+- faber -h
+- ls -l $HOME/Boost
+
+script:
+- |
+   if [ "$DOC" ]; then
+     BOOST_ROOT=$HOME/Boost faber --builddir=build doc.html
+   else
+     faber --with-boost-include=$HOME/Boost --builddir=build test.report cxx.name=$CXX cxxflags=$CXXFLAGS
+   fi
+
+after_success:
+# Upload docs only when building upstream.
+- |
+   if [ "$DOC" -a \
+        "$TRAVIS_REPO_SLUG" = "boostorg/python" -a \
+        "$TRAVIS_PULL_REQUEST" = "false" ]; then
+     export GH_TOKEN
+     .ci/upload_docs.sh
+   fi

Jamfile

@@ -0,0 +1,68 @@
+# Copyright (c) 2018 Stefan Seefeld
+# All rights reserved.
+#
+# 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)
+
+import option ;
+import regex ;
+import python ;
+
+#
+# The `version-suffix` rule really belongs into python.jam, and
+# should be moved there. `split-version` is only duplicated here
+# as a prerequisite. (See https://github.com/boostorg/build/pull/290)
+#
+
+
+# Validate the version string and extract the major/minor part we care about.
+#
+local rule split-version ( version )
+{
+    local major-minor = [ MATCH "^([0-9]+)\.([0-9]+)(.*)$" : $(version) : 1 2 3 ] ;
+    if ! $(major-minor[2]) || $(major-minor[3])
+    {
+        ECHO "Warning: \"using python\" expects a two part (major, minor) version number; got" $(version) instead ;
+
+        # Add a zero to account for the missing digit if necessary.
+        major-minor += 0 ;
+    }
+
+    return $(major-minor[1]) $(major-minor[2]) ;
+}
+
+# Define a version suffix for libraries depending on Python.
+# For example, Boost.Python built for Python 2.7 uses the suffix "27"
+rule version-suffix ( version )
+{
+    local major-minor = [ split-version $(version) ] ;
+    local suffix = $(major-minor:J="") ;
+    return $(suffix) ;
+}
+
+
+# Python build id (for Python libraries only).
+python-id = [ option.get "python-buildid" ] ;
+if $(python-id)
+{
+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
+}
+
+rule python-tag ( name : type ? : property-set )
+{
+    local result = $(name) ;
+    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB
+    {
+        local version = [ $(property-set).get <python> ] ;
+        local lib-suffix = [ version-suffix $(version) ] ;
+        result = $(result)$(lib-suffix) ;
+    }
+    if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID)
+    {
+        result = $(result)-$(PYTHON_ID) ;
+    }
+
+    # forward to the boost tagging rule
+    return  [ tag $(result) : $(type) : $(property-set) ] ;
+}

README.md

@@ -21,7 +21,8 @@ See the [Boost.Python](http://boostorg.github.io/python) documentation for detai
 
 **Hint :** Check out the [development version](http://boostorg.github.io/python/develop) of the documentation to see work in progress.
 
-# Building ![Test Ubuntu](https://github.com/boostorg/python/workflows/Test%20Ubuntu/badge.svg) ![Test OSX](https://github.com/boostorg/python/workflows/Test%20OSX/badge.svg) ![Test Windows](https://github.com/boostorg/python/workflows/Test%20Windows/badge.svg)
+# Building [![Build Status](https://travis-ci.org/boostorg/python.svg?branch=develop)](https://travis-ci.org/boostorg/python) [![Build status](https://ci.appveyor.com/api/projects/status/cgx9xma6v3gjav92/branch/develop?svg=true)](https://ci.appveyor.com/project/stefanseefeld/python/branch/develop)
+
 
 While Boost.Python is part of the Boost C++ Libraries super-project, and thus can be compiled as part of Boost, it can also be compiled and installed stand-alone, i.e. against a pre-installed Boost package.
 

build/Jamfile

@@ -30,6 +30,8 @@ else
         ;
 }
 
+if [ python.configured ]
+{
 project boost/python
   : source-location ../src
   ;
@@ -93,7 +95,7 @@ lib boost_python
         <dependency>config-warning
         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
         -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-        <tag>@python-tag
+        <tag>@$(__name__).python-tag
         <conditional>@python.require-py
 
     :   # default build
@@ -121,7 +123,7 @@ lib boost_numpy
         <library>boost_python
         <python-debugging>on:<define>BOOST_DEBUG_PYTHON
         -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-        <tag>@python-tag
+	<tag>@$(__name__).python-tag
         <conditional>@python.require-py
 
     :   # default build
@@ -140,16 +142,8 @@ lib boost_numpy
 # `install` installs the two libraries and their dependencies and is similar
 #   to issuing `b2 --with-python install` from top level
 
-if [ python.configured ]
-{
-    if [ python.numpy ]
-    {
-        boost-install boost_python boost_numpy ;
-    }
-    else
-    {
-        boost-install boost_python ;
-    }
+boost-install boost_python boost_numpy ;
+
 }
 else
 {

doc/reference/call_method.qbk

@@ -20,8 +20,6 @@ C++ Module Definition
 ``
 #include <boost/python/module.hpp>
 #include <boost/python/class.hpp>
-#include <boost/python/call_method.hpp>
-#include <boost/python/def.hpp>
 #include <boost/utility.hpp>
 #include <cstring>
 
@@ -30,7 +28,7 @@ class Base
 {
  public:
    virtual char const* class_name() const { return "Base"; }
-   virtual ~Base() {};
+   virtual ~Base();
 };
 
 bool is_base(Base* b)
@@ -58,7 +56,7 @@ BOOST_PYTHON_MODULE(my_module)
 {
     def("is_base", is_base);
 
-    class_<Base,Base_callback, boost::noncopyable>("Base")
+    class_<Base,Base_callback, noncopyable>("Base")
         .def("class_name", &Base_callback::Base_name)
         ;
 

doc/tutorial.qbk

@@ -121,7 +121,7 @@ __jam__
 file. Simply copy the file and tweak [^use-project boost] to where your
 boost root directory is and you're OK.
 
-The comments contained in the Jamroot file above should be sufficient
+The comments contained in the Jamrules file above should be sufficient
 to get you going.
 
 [h2 Running bjam]

fabscript

@@ -75,8 +75,8 @@ checks = [cxx_checks.has_cxx11(features, define('HAS_CXX11')),
           has_numpy(features)]
 config = report('config', checks)
 
-src = module('src', features=features|config.use)
-test = module('test', features=features|config.use)
-doc = module('doc', features=features|config.use)
+src = module('src', features=config.use)
+test = module('test', features=config.use)
+doc = module('doc', features=config.use)
 
 default = src.default

include/boost/python/call.hpp

@@ -60,7 +60,7 @@ call(PyObject* callable
     )
 {
     PyObject* const result = 
-        PyObject_CallFunction(
+        PyEval_CallFunction(
             callable
             , const_cast<char*>("(" BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FIXED, "O") ")")
             BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET, nil)
@@ -69,7 +69,7 @@ call(PyObject* callable
     // This conversion *must not* be done in the same expression as
     // the call, because, in the special case where the result is a
     // reference a Python object which was created by converting a C++
-    // argument for passing to PyObject_CallFunction, its reference
+    // argument for passing to PyEval_CallFunction, its reference
     // count will be 2 until the end of the full expression containing
     // the conversion, and that interferes with dangling
     // pointer/reference detection.

include/boost/python/call_method.hpp

@@ -69,7 +69,7 @@ call_method(PyObject* self, char const* name
     // This conversion *must not* be done in the same expression as
     // the call, because, in the special case where the result is a
     // reference a Python object which was created by converting a C++
-    // argument for passing to PyObject_CallFunction, its reference
+    // argument for passing to PyEval_CallFunction, its reference
     // count will be 2 until the end of the full expression containing
     // the conversion, and that interferes with dangling
     // pointer/reference detection.

include/boost/python/def_visitor.hpp

@@ -16,7 +16,7 @@ template <class T, class X1, class X2, class X3> class class_;
 class def_visitor_access
 {
 # if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
-    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
+    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
     // Tasteless as this may seem, making all members public allows member templates
     // to work in the absence of member template friends.
  public:
@@ -52,7 +52,7 @@ class def_visitor
     friend class def_visitor_access;
     
 # if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
-    || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x551))
+    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
     // Tasteless as this may seem, making all members public allows member templates
     // to work in the absence of member template friends.
  public:

include/boost/python/detail/caller.hpp

@@ -109,23 +109,6 @@ struct converter_target_type <void_result_to_python >
         return 0;
     }
 };
-
-// Generation of ret moved from caller_arity<N>::impl::signature to here due to "feature" in MSVC 15.7.2 with /O2
-// which left the ret uninitialized and caused segfaults in Python interpreter.
-template<class Policies, class Sig> const signature_element* get_ret()
-{
-    typedef BOOST_DEDUCED_TYPENAME Policies::template extract_return_type<Sig>::type rtype;
-    typedef typename select_result_converter<Policies, rtype>::type result_converter;
-
-    static const signature_element ret = {
-        (is_void<rtype>::value ? "void" : type_id<rtype>().name())
-        , &detail::converter_target_type<result_converter>::get_pytype
-        , boost::detail::indirect_traits::is_reference_to_non_const<rtype>::value 
-    };
-
-    return &ret;
-}
-
 #endif
 
     
@@ -246,12 +229,16 @@ struct caller_arity<N>
         {
             const signature_element * sig = detail::signature<Sig>::elements();
 #ifndef BOOST_PYTHON_NO_PY_SIGNATURES
-            // MSVC 15.7.2, when compiling to /O2 left the static const signature_element ret, 
-            // originally defined here, uninitialized. This in turn led to SegFault in Python interpreter.
-            // Issue is resolved by moving the generation of ret to separate function in detail namespace (see above).
-            const signature_element * ret = detail::get_ret<Policies, Sig>();
 
-            py_func_sig_info res = {sig, ret };
+            typedef BOOST_DEDUCED_TYPENAME Policies::template extract_return_type<Sig>::type rtype;
+            typedef typename select_result_converter<Policies, rtype>::type result_converter;
+
+            static const signature_element ret = {
+                (is_void<rtype>::value ? "void" : type_id<rtype>().name())
+                , &detail::converter_target_type<result_converter>::get_pytype
+                , boost::detail::indirect_traits::is_reference_to_non_const<rtype>::value 
+            };
+            py_func_sig_info res = {sig, &ret };
 #else
             py_func_sig_info res = {sig, sig };
 #endif

include/boost/python/detail/unwind_type.hpp

@@ -11,15 +11,13 @@
 
 namespace boost { namespace python { namespace detail {
 
-#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
-// If forward declared, msvc6.5 does not recognize them as inline.
-// However, as of msvc14.15 (_MSC_VER 1915/Visual Studio 15.8.0) name lookup is now consistent with other compilers.
-// forward declaration, required (at least) by Tru64 cxx V6.5-042 and msvc14.15
+#ifndef _MSC_VER //if forward declared, msvc6.5 does not recognize them as inline
+// forward declaration, required (at least) by Tru64 cxx V6.5-042
 template <class Generator, class U>
 inline typename Generator::result_type
 unwind_type(U const& p, Generator* = 0);
 
-// forward declaration, required (at least) by Tru64 cxx V6.5-042 and msvc14.15
+// forward declaration, required (at least) by Tru64 cxx V6.5-042
 template <class Generator, class U>
 inline typename Generator::result_type
 unwind_type(boost::type<U>*p = 0, Generator* = 0);
@@ -85,7 +83,7 @@ struct unwind_helper<false>
 
 template <class Generator, class U>
 inline typename Generator::result_type
-#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
+#ifndef _MSC_VER
 unwind_type(U const& p, Generator*)
 #else
 unwind_type(U const& p, Generator* = 0)
@@ -150,7 +148,7 @@ struct unwind_helper2<reference_to_pointer_>
 // why bother?
 template <class Generator, class U>
 inline typename Generator::result_type
-#if (!defined(_MSC_VER) || _MSC_VER >= 1915)
+#ifndef _MSC_VER
 unwind_type(boost::type<U>*, Generator*)
 #else
 unwind_type(boost::type<U>*p =0, Generator* =0)

include/boost/python/detail/wrap_python.hpp

@@ -47,13 +47,6 @@
 # endif
 #endif
 
-// pyconfig.h defines a macro with hypot name, what breaks libstdc++ math headers
-// that Python.h tries to include afterwards.
-#if defined(__MINGW32__)
-# include <cmath>
-# include <math.h>
-#endif
-
 # include <pyconfig.h>
 # if defined(_SGI_COMPILER_VERSION) && _SGI_COMPILER_VERSION >= 740
 #  undef _POSIX_C_SOURCE
@@ -90,7 +83,6 @@
 // than MSVC on Win32
 //
 #if defined(_WIN32) || defined(__CYGWIN__)
-
 # if defined(__GNUC__) && defined(__CYGWIN__)
 
 #  if defined(__LP64__)
@@ -146,45 +138,19 @@ typedef int pid_t;
 
 #  undef hypot // undo the evil #define left by Python.
 
-# elif defined(__BORLANDC__) && !defined(__clang__)
+# elif defined(__BORLANDC__)
 #  undef HAVE_HYPOT
 #  define HAVE_HYPOT 1
 # endif
 
 #endif // _WIN32
 
-#if defined(__GNUC__)
-# if defined(__has_warning)
-#  define BOOST_PYTHON_GCC_HAS_WREGISTER __has_warning("-Wregister")
-# else
-#  define BOOST_PYTHON_GCC_HAS_WREGISTER __GNUC__ >= 7
-# endif
-#else
-# define BOOST_PYTHON_GCC_HAS_WREGISTER 0
-#endif
-
-// Python.h header uses `register` keyword until Python 3.4
-#if BOOST_PYTHON_GCC_HAS_WREGISTER
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wregister"
-#elif defined(_MSC_VER)
-# pragma warning(push)
-# pragma warning(disable : 5033)  // 'register' is no longer a supported storage class
-#endif
-
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 2 && PY_MICRO_VERSION < 2
 # include <boost/python/detail/python22_fixed.h>
 #else
 # include <Python.h>
 #endif
 
-#if BOOST_PYTHON_GCC_HAS_WREGISTER
-# pragma GCC diagnostic pop
-#elif defined(_MSC_VER)
-# pragma warning(pop)
-#endif
-#undef BOOST_PYTHON_GCC_HAS_WREGISTER
-
 #ifdef BOOST_PYTHON_ULONG_MAX_UNDEFINED
 # undef ULONG_MAX
 # undef BOOST_PYTHON_ULONG_MAX_UNDEFINED
@@ -227,11 +193,7 @@ typedef int pid_t;
 
 # define PyVarObject_HEAD_INIT(type, size) \
         PyObject_HEAD_INIT(type) size,
-#endif
 
-#if PY_VERSION_HEX < 0x030900A4
-#  define Py_SET_TYPE(obj, type) ((Py_TYPE(obj) = (type)), (void)0)
-#  define Py_SET_SIZE(obj, size) ((Py_SIZE(obj) = (size)), (void)0)
 #endif
 
 

include/boost/python/list.hpp

@@ -73,7 +73,7 @@ class list : public detail::list_base
     }
 
     template <class T>
-    ssize_t count(T const& value) const
+    long count(T const& value) const
     {
         return base::count(object(value));
     }

include/boost/python/long.hpp

@@ -24,8 +24,8 @@ namespace detail
       BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(long_base, object)
           
    private:
-      static detail::new_reference call(object const&);
-      static detail::new_reference call(object const&, object const&);
+      static detail::new_non_null_reference call(object const&);
+      static detail::new_non_null_reference call(object const&, object const&);
   };
 }
 

include/boost/python/object/iterator.hpp

@@ -25,7 +25,7 @@
 
 # include <boost/type.hpp>
 
-# include <iterator>
+# include <boost/detail/iterator.hpp>
 
 namespace boost { namespace python { namespace objects {
 
@@ -42,7 +42,7 @@ struct iterator_range
 {
     iterator_range(object sequence, Iterator start, Iterator finish);
 
-    typedef std::iterator_traits<Iterator> traits_t;
+    typedef boost::detail::iterator_traits<Iterator> traits_t;
 
     struct next
     {

include/boost/python/object/make_instance.hpp

@@ -47,7 +47,7 @@ struct make_instance_impl
               
             // Note the position of the internally-stored Holder,
             // for the sake of destruction
-            Py_SET_SIZE(instance, offsetof(instance_t, storage));
+            Py_SIZE(instance) = offsetof(instance_t, storage);
 
             // Release ownership of the python object
             protect.cancel();

include/boost/python/override.hpp

@@ -97,7 +97,7 @@ class override : public object
     operator()() const
     {
         detail::method_result x(
-            PyObject_CallFunction(
+            PyEval_CallFunction(
                 this->ptr()
               , const_cast<char*>("()")
             ));
@@ -132,7 +132,7 @@ detail::method_result
 operator()( BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, const& a) ) const
 {
     detail::method_result x(
-        PyObject_CallFunction(
+        PyEval_CallFunction(
             this->ptr()
           , const_cast<char*>("(" BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FIXED, "O") ")")
             BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_fast_arg_to_python_get, nil)

meta/libraries.json

@@ -10,6 +10,5 @@
     ],
     "maintainers": [
 	"Stefan Seefeld <stefan -at- seefeld.name>"
-    ],
-    "cxxstd": "03"
+    ]
 }

src/exec.cpp

@@ -104,22 +104,14 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
   if (local.is_none()) local = global;
   // should be 'char const *' but older python versions don't use 'const' yet.
   char *f = const_cast<char *>(filename);
-#if PY_VERSION_HEX >= 0x03010000
-  // Let python manage any UTF bits to avoid potential incompatibilities.
-  PyObject *fo = Py_BuildValue("s", f);
-  PyObject *fb = Py_None;
-  PyUnicode_FSConverter(fo, &fb);
-  f = PyBytes_AsString(fb);
-  FILE *fs = fopen(f, "r");
-  Py_DECREF(fo);
-  Py_DECREF(fb);
-#elif PY_VERSION_HEX >= 0x03000000
   // Let python open the file to avoid potential binary incompatibilities.
+#if PY_VERSION_HEX >= 0x03040000
+  FILE *fs = _Py_fopen(f, "r");
+#elif PY_VERSION_HEX >= 0x03000000
   PyObject *fo = Py_BuildValue("s", f);
-  FILE *fs = fopen(fo, "r");
+  FILE *fs = _Py_fopen(fo, "r");
   Py_DECREF(fo);
 #else
-  // Let python open the file to avoid potential binary incompatibilities.
   PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
   if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
   python::handle<> file(pyfile);

src/long.cpp

@@ -6,16 +6,16 @@
 
 namespace boost { namespace python { namespace detail {
 
-new_reference long_base::call(object const& arg_)
+new_non_null_reference long_base::call(object const& arg_)
 {
-    return (detail::new_reference)PyObject_CallFunction(
+    return (detail::new_non_null_reference)PyObject_CallFunction(
         (PyObject*)&PyLong_Type, const_cast<char*>("(O)"), 
         arg_.ptr());
 }
 
-new_reference long_base::call(object const& arg_, object const& base)
+new_non_null_reference long_base::call(object const& arg_, object const& base)
 {
-    return (detail::new_reference)PyObject_CallFunction(
+    return (detail::new_non_null_reference)PyObject_CallFunction(
         (PyObject*)&PyLong_Type, const_cast<char*>("(OO)"), 
         arg_.ptr(), base.ptr());
 }

src/module.cpp

@@ -21,7 +21,7 @@ namespace
             object m_obj(((borrowed_reference_t*)m));
             scope current_module(m_obj);
 
-            if (handle_exception(init_function)) return NULL;
+            handle_exception(init_function);
         }
 
         return m;

src/object/class.cpp

@@ -208,7 +208,7 @@ namespace objects
   {
       if (static_data_object.tp_dict == 0)
       {
-          Py_SET_TYPE(&static_data_object, &PyType_Type);
+          Py_TYPE(&static_data_object) = &PyType_Type;
           static_data_object.tp_base = &PyProperty_Type;
           if (PyType_Ready(&static_data_object))
               return 0;
@@ -316,7 +316,7 @@ namespace objects
   {
       if (class_metatype_object.tp_dict == 0)
       {
-          Py_SET_TYPE(&class_metatype_object, &PyType_Type);
+          Py_TYPE(&class_metatype_object) = &PyType_Type;
           class_metatype_object.tp_base = &PyType_Type;
           if (PyType_Ready(&class_metatype_object))
               return type_handle();
@@ -374,7 +374,12 @@ namespace objects
               // like, so we'll store the total size of the object
               // there. A negative number indicates that the extra
               // instance memory is not yet allocated to any holders.
-              Py_SET_SIZE(result,-static_cast<int>(offsetof(instance<>,storage) + instance_size));
+#if PY_VERSION_HEX >= 0x02060000
+              Py_SIZE(result) =
+#else
+              result->ob_size =
+#endif
+                  -(static_cast<int>(offsetof(instance<>,storage) + instance_size));
           }
           return (PyObject*)result;
       }
@@ -465,7 +470,7 @@ namespace objects
   {
       if (class_type_object.tp_dict == 0)
       {
-          Py_SET_TYPE(&class_type_object, incref(class_metatype().get()));
+          Py_TYPE(&class_type_object) = incref(class_metatype().get());
           class_type_object.tp_base = &PyBaseObject_Type;
           if (PyType_Ready(&class_type_object))
               return type_handle();
@@ -734,7 +739,7 @@ void* instance_holder::allocate(PyObject* self_, std::size_t holder_offset, std:
         assert(holder_offset >= offsetof(objects::instance<>,storage));
 
         // Record the fact that the storage is occupied, noting where it starts
-        Py_SET_SIZE(self, holder_offset);
+        Py_SIZE(self) = holder_offset;
         return (char*)self + holder_offset;
     }
     else

src/object/enum.cpp

@@ -153,7 +153,7 @@ namespace
   {
       if (enum_type_object.tp_dict == 0)
       {
-          Py_SET_TYPE(&enum_type_object, incref(&PyType_Type));
+          Py_TYPE(&enum_type_object) = incref(&PyType_Type);
 #if PY_VERSION_HEX >= 0x03000000
           enum_type_object.tp_base = &PyLong_Type;
 #else

src/object/function.cpp

@@ -107,7 +107,7 @@ function::function(
     PyObject* p = this;
     if (Py_TYPE(&function_type) == 0)
     {
-        Py_SET_TYPE(&function_type, &PyType_Type);
+        Py_TYPE(&function_type) = &PyType_Type;
         ::PyType_Ready(&function_type);
     }
     
@@ -444,9 +444,7 @@ void function::add_to_namespace(
         if (dict == 0)
             throw_error_already_set();
 
-        assert(!PyErr_Occurred());
         handle<> existing(allow_null(::PyObject_GetItem(dict.get(), name.ptr())));
-        PyErr_Clear();
         
         if (existing)
         {
@@ -487,15 +485,16 @@ void function::add_to_namespace(
         if (new_func->name().is_none())
             new_func->m_name = name;
 
-        assert(!PyErr_Occurred());
         handle<> name_space_name(
             allow_null(::PyObject_GetAttrString(name_space.ptr(), const_cast<char*>("__name__"))));
-        PyErr_Clear();
         
         if (name_space_name)
             new_func->m_namespace = object(name_space_name);
     }
 
+    // The PyObject_GetAttrString() or PyObject_GetItem calls above may
+    // have left an active error
+    PyErr_Clear();
     if (PyObject_SetAttr(ns, name.ptr(), attribute.ptr()) < 0)
         throw_error_already_set();
 

src/object/life_support.cpp

@@ -93,7 +93,7 @@ PyObject* make_nurse_and_patient(PyObject* nurse, PyObject* patient)
     
     if (Py_TYPE(&life_support_type) == 0)
     {
-        Py_SET_TYPE(&life_support_type, &PyType_Type);
+        Py_TYPE(&life_support_type) = &PyType_Type;
         PyType_Ready(&life_support_type);
     }
     

src/wrapper.cpp

@@ -25,7 +25,7 @@ namespace detail
             
               if (
                   PyMethod_Check(m.get())
-                  && PyMethod_GET_SELF(m.get()) == this->m_self
+                  && ((PyMethodObject*)m.get())->im_self == this->m_self
                   && class_object->tp_dict != 0
               )
               {
@@ -34,7 +34,7 @@ namespace detail
 
 
               }
-              if (borrowed_f != PyMethod_GET_FUNCTION(m.get()))
+              if (borrowed_f != ((PyMethodObject*)m.get())->im_func)
                   return override(m);
           }
       }

test/args.py

@@ -1,19 +1,15 @@
 # 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)
+from __future__ import print_function
 """
 >>> from args_ext import *
 
->>> args, kwargs = raw(3, 4, foo = 'bar', baz = 42)
->>> args
-(3, 4)
->>> kwargs['foo']
-'bar'
->>> kwargs['baz']
-42
+>>> raw(3, 4, foo = 'bar', baz = 42)
+((3, 4), {'foo': 'bar', 'baz': 42})
 
    Prove that we can handle empty keywords and non-keywords
-
+   
 >>> raw(3, 4)
 ((3, 4), {})
 
@@ -80,7 +76,7 @@
 ... else: print('expected an exception: unknown keyword')
 
    Exercise member functions using default stubs
-
+   
 >>> q.f1(z = 'nix', y = .125, x = 2)
 (2, 0.125, 'nix')
 >>> q.f1(y = .125, x = 2)
@@ -127,16 +123,10 @@
 1
 
 >>> y = Y(value = 33)
->>> _, kwargs = y.raw(this = 1, that = 'the other')
->>> kwargs['this']
-1
->>> kwargs['that']
-'the other'
+>>> y.raw(this = 1, that = 'the other')[1]
+{'this': 1, 'that': 'the other'}
 
 """
-
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -153,3 +143,6 @@ if __name__ == '__main__':
     import args_ext
     help(args_ext)
     sys.exit(status)
+
+
+

test/dict.cpp

@@ -21,13 +21,11 @@ object new_dict()
 object data_dict()
 {
     dict tmp1;
+    tmp1["key1"] = "value1";
 
     dict tmp2;
     tmp2["key2"] = "value2";
     tmp1[1] = tmp2;
-
-    tmp1["key1"] = "value1";
-
     return tmp1;
 }
 
@@ -62,20 +60,22 @@ void work_with_dict(dict data1, dict data2)
 void test_templates(object print)
 {
     std::string key = "key";
-
+    
     dict tmp;
-    tmp[1.5] = 13;
-    print(tmp.get(1.5));
     tmp[1] = "a test string";
     print(tmp.get(1));
+    //print(tmp[1]);
+    tmp[1.5] = 13;
+    print(tmp.get(1.5));
     print(tmp.get(44));
     print(tmp);
     print(tmp.get(2,"default"));
     print(tmp.setdefault(3,"default"));
 
     BOOST_ASSERT(!tmp.has_key(key));
+    //print(tmp[3]);
 }
-
+    
 BOOST_PYTHON_MODULE(dict_ext)
 {
     def("new_dict", new_dict);

test/dict.py

@@ -1,6 +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)
+from __future__ import print_function
 """
 >>> from dict_ext import *
 >>> def printer(*args):
@@ -21,16 +22,14 @@
 >>> print(dict_from_sequence([(1,1),(2,2),(3,3)]))
 {1: 1, 2: 2, 3: 3}
 >>> test_templates(printer) #doctest: +NORMALIZE_WHITESPACE
-13
 a test string
+13
 None
 {1.5: 13, 1: 'a test string'}
 default
 default
 """
 
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -38,7 +37,7 @@ def run(args = None):
     if args is not None:
         sys.argv = args
     return doctest.testmod(sys.modules.get(__name__))
-
+    
 if __name__ == '__main__':
     print("running...")
     import sys

test/fabscript

@@ -21,14 +21,14 @@ src = module('..src')
 python_libs=python.instance().libs
 features |= runpath(src.bpl.path, base='')
 
-def extension_test(name, exts=[], script=None, numpy=False,
+def extension_test(name, ext=[], script=None, np=False,
                    features=features, condition=None):
     """Create a Python extension test `name`.
     Arguments:
       * name: the name of the test.
-      * exts: extensions to be compiled, <name> if none are given.
+      * ext: extensions to be compiled, <name> if none are given.
       * script: the test script to execute, <name>.py if none is given.
-      * numpy: if true, add boost_numpy to sources
+      * np: if true, add boost_numpy to sources
       * features: pre-defined features
       * condition: any condition under which to run the test
     Return:
@@ -36,17 +36,17 @@ def extension_test(name, exts=[], script=None, numpy=False,
 
     features=features.copy()
     extensions = []
-    libs = [src.bnl, src.bpl] if numpy else [src.bpl]
-    for ext in exts or [name]:
-        if type(ext) is str:  # build from a single source file
-            ext_name = ext if ext != name else ext + '_ext'
-            sources = [ext + '.cpp']
+    libs = [src.bnl, src.bpl] if np else [src.bpl]
+    for e in ext or [name]:
+        if type(e) is str:  # build from a single source file
+            n = e if e != name else e + '_ext'
+            s = [e + '.cpp']
         else:  # build from a list of source files
-            ext_name = ext[0] if ext[0] != name else ext[0] + '_ext'
-            sources = [source + '.cpp' for source in ext]
-        ext = extension(ext_name, sources + libs, features=features)
-        features |= pythonpath(ext.path, base='')
-        extensions.append(ext)
+            n = e[0] if e[0] != name else e[0] + '_ext'
+            s = [n + '.cpp' for n in e]
+        e = extension(n, s + libs, features=features)
+        features |= pythonpath(e.path, base='')
+        extensions.append(e)
     if not script:
         script = name+'.py'
     return test(name, script, run=python.run, dependencies=extensions,
@@ -67,7 +67,6 @@ for t in [('injected',),
           ('args',),
           ('raw_ctor',),
           ('exception_translator',),
-          ('module_init_exception',),
           ('test_enum', ['enum_ext']),
           ('test_cltree', ['cltree']),
           ('newtest', ['m1', 'm2']),
@@ -124,9 +123,9 @@ tests.append(extension_test('auto_ptr',
 import_ = binary('import_', ['import_.cpp', src.bpl], features=features|python_libs)
 if platform.os == 'Windows':
     command = """set PATH=$(runpath);%PATH%
-$(>[0]) $(>[1])"""
+$(>[1]) $(>[2])"""
 else:
-    command = 'LD_LIBRARY_PATH=$(runpath) $(>[0]) $(>[1])'
+    command = 'LD_LIBRARY_PATH=$(runpath) $(>[1]) $(>[2])'
 
 tests.append(test('import', [import_, 'import_.py'],
                   run=action('run', command),
@@ -168,7 +167,7 @@ for t in ['numpy/dtype',
           'numpy/ndarray',
           'numpy/indexing',
           'numpy/shapes']:
-    tests.append(extension_test(t, numpy=True,
+    tests.append(extension_test(t, np=True,
                                 condition=set.define.contains('HAS_NUMPY')))
 
 default = report('report', tests, fail_on_failures=True)

test/iterator.py

@@ -1,6 +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)
+from __future__ import print_function
 '''
 >>> from iterator_ext import *
 >>> from input_iterator import *
@@ -24,7 +25,7 @@
 
    Range2 wraps a transform_iterator which doubles the elements it
    traverses. This proves we can wrap input iterators
-
+   
 >>> z2 = range2(x)
 >>> for y in z2:
 ...     print(y)
@@ -55,15 +56,12 @@
 >>> ll.push_back(x)
 >>> for a in ll: #doctest: +NORMALIZE_WHITESPACE
 ...     for b in a:
-...         print(b, end=' ')
+...         print(b, end='')
 ...     print('')
 ...
 1 3 5
 1 3 5 7
 '''
-
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -71,7 +69,7 @@ def run(args = None):
     if args is not None:
         sys.argv = args
     return doctest.testmod(sys.modules.get(__name__))
-
+    
 if __name__ == '__main__':
     print("running...")
     import sys

test/list.py

@@ -1,6 +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)
+from __future__ import print_function
 '''
 >>> from list_ext import *
 
@@ -40,7 +41,7 @@ X(22)
 ['h', 'e', 'l', 'l', 'o', '.']
 
   tuples do not automatically convert to lists when passed as arguments
-
+  
 >>> try: append_list(letters, (1,2))
 ... except TypeError: pass
 ... else: print('expected an exception')
@@ -50,7 +51,7 @@ X(22)
 ['h', 'e', 'l', 'l', 'o', '.', [1, 2]]
 
     Check that subclass functions are properly called
-
+    
 >>> class mylist(list):
 ...     def append(self, o):
 ...         list.append(self, o)
@@ -102,8 +103,6 @@ reverse sorted:
 ['y', 'x', 'o', 'l', 'l', 'h', 'e', '.']
 '''
 
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -111,7 +110,7 @@ def run(args = None):
     if args is not None:
         sys.argv = args
     return doctest.testmod(sys.modules.get(__name__))
-
+    
 if __name__ == '__main__':
     print("running...")
     import sys

test/long.py

@@ -1,6 +1,9 @@
 # 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)
+import sys
+if (sys.version_info.major >= 3):
+    long = int
 '''
 >>> from long_ext import *
 >>> print(new_long())
@@ -17,10 +20,6 @@
 >>> x = Y(long(4294967295))
 '''
 
-import sys
-if (sys.version_info.major >= 3):
-    long = int
-
 def run(args = None):
     import sys
     import doctest

test/map_indexing_suite.py

@@ -1,6 +1,7 @@
 # Copyright Joel de Guzman 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)
+from __future__ import print_function
 '''
 
 #####################################################################
@@ -24,7 +25,7 @@ foo
 
 # test that a string is implicitly convertible
 # to an X
->>> x_value('bochi bochi')
+>>> x_value('bochi bochi') 
 'gotya bochi bochi'
 
 #####################################################################
@@ -32,9 +33,9 @@ foo
 #####################################################################
 >>> def print_xmap(xmap):
 ...     s = '[ '
-...     for x in xmap:
+...     for x in xmap: 
 ...         s += repr(x)
-...         s += ' '
+...         s += ' ' 
 ...     s += ']'
 ...     print(s)
 
@@ -134,7 +135,7 @@ foo
 >>> assert not 12345 in xm
 
 #####################################################################
-# Some references to the container elements
+# Some references to the container elements 
 #####################################################################
 
 >>> z0 = xm['joel']
@@ -155,7 +156,7 @@ banana
 kiwi
 
 #####################################################################
-# Delete some container element
+# Delete some container element 
 #####################################################################
 
 >>> del xm['tenji']
@@ -167,7 +168,7 @@ kiwi
 [ (joel, apple) (kim, kiwi) (mariel, grape) ]
 
 #####################################################################
-# Show that the references are still valid
+# Show that the references are still valid 
 #####################################################################
 >>> z0 # proxy
 apple
@@ -198,7 +199,7 @@ kiwi
 >>> print_xmap(tm)
 [ (joel, aaa) (kimpo, bbb) ]
 >>> for el in tm: #doctest: +NORMALIZE_WHITESPACE
-...     print(el.key(), end=' ')
+...     print(el.key(), end='')
 ...     dom = el.data()
 joel kimpo
 
@@ -215,12 +216,11 @@ joel kimpo
 4
 
 #####################################################################
-# END....
+# END.... 
 #####################################################################
 
 '''
 
-from __future__ import print_function
 
 def run(args = None):
     import sys
@@ -236,3 +236,8 @@ if __name__ == '__main__':
     status = run()[0]
     if (status == 0): print("Done.")
     sys.exit(status)
+
+
+
+
+

test/module_init_exception.cpp

@@ -1,14 +0,0 @@
-// Copyright (C) 2003 Rational Discovery LLC
-// 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/module.hpp>
-#include <stdexcept>
-
-using namespace boost::python;
-
-BOOST_PYTHON_MODULE(module_init_exception_ext)
-{
-    throw std::runtime_error("Module init failed");
-}

test/module_init_exception.py

@@ -1,12 +0,0 @@
-# Copyright (C) 2003 Rational Discovery LLC.  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)
-
-print("running...")
-
-try:
-    import module_init_exception_ext
-except RuntimeError as e:
-    print(e)
-
-print("Done.")

test/object.py

@@ -1,6 +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)
+from __future__ import print_function
 '''
 >>> from object_ext import *
 
@@ -129,14 +130,14 @@
 1
 
         Slices
-
+        
 >>> assert check_string_slice()
 
         Operators
 
->>> def print_args(*args, **kwds):
+>>> def print_args(*args, **kwds): 
 ...     print(args, kwds)
->>> test_call(print_args, (0, 1, 2, 3), {'a':'A'})
+>>> test_call(print_args, (0, 1, 2, 3), {'a':'A'}) 
 (0, 1, 2, 3) {'a': 'A'}
 
 
@@ -148,7 +149,7 @@
 
 
        Now make sure that object is actually managing reference counts
-
+       
 >>> import weakref
 >>> class Z: pass
 ...
@@ -163,8 +164,6 @@
 death
 '''
 
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -172,7 +171,7 @@ def run(args = None):
     if args is not None:
         sys.argv = args
     return doctest.testmod(sys.modules.get(__name__))
-
+    
 if __name__ == '__main__':
     print("running...")
     import sys

test/pickle2.py

@@ -1,6 +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)
+from __future__ import print_function
 r'''>>> import pickle2_ext
     >>> import pickle
     >>> pickle2_ext.world.__module__
@@ -34,8 +35,6 @@ r'''>>> import pickle2_ext
     Incomplete pickle support (__getstate_manages_dict__ not set)
 '''
 
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -43,7 +42,7 @@ def run(args = None):
     if args is not None:
         sys.argv = args
     return doctest.testmod(sys.modules.get(__name__))
-
+    
 if __name__ == '__main__':
     print("running...")
     import sys

test/pickle3.py

@@ -1,6 +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)
+from __future__ import print_function
 r'''>>> import pickle3_ext
     >>> import pickle
     >>> pickle3_ext.world.__module__
@@ -29,8 +30,6 @@ r'''>>> import pickle3_ext
     Hello from California! 0 84 yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy 126.0
 '''
 
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -38,7 +37,7 @@ def run(args = None):
     if args is not None:
         sys.argv = args
     return doctest.testmod(sys.modules.get(__name__))
-
+    
 if __name__ == '__main__':
     print("running...")
     import sys

test/str.py

@@ -1,10 +1,11 @@
 # 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)
+from __future__ import print_function
 """
 >>> from str_ext import *
 >>> def printer(*args):
-...     for x in args: print(x, end=' ')
+...     for x in args: print(x, end='')
 ...     print('')
 ...
 >>> work_with_string(printer) #doctest: +NORMALIZE_WHITESPACE
@@ -37,8 +38,6 @@ this is a blabla string
 aaaaaaaaaaaaaaaaaaaaa
 """
 
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -46,7 +45,7 @@ def run(args = None):
     if args is not None:
         sys.argv = args
     return doctest.testmod(sys.modules.get(__name__))
-
+    
 if __name__ == '__main__':
     print("running...")
     import sys

test/test_builtin_converters.py

@@ -1,7 +1,9 @@
-# -*- coding: utf-8 -*-
 # 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)
+import sys
+if (sys.version_info.major >= 3):
+    long = int
 r"""
 >>> from builtin_converters_ext import *
 
@@ -15,7 +17,7 @@ r"""
 
 # Wrappers to simplify tests
 >>> def should_pass(method, values):
-...     result = list(map(method, values[0]))
+...     result = map(method, values[0])
 ...     if result != values[0]:
 ...         print("Got %s but expected %s" % (result, values[0]))
 >>> def test_overflow(method, values):
@@ -134,6 +136,9 @@ True
 >>> print(rewrap_value_wstring(u'yo, wassup?'))
 yo, wassup?
 
+>>> print(rewrap_value_wstring(u'\U0001f4a9'))
+\U0001f4a9
+
    test that overloading on unicode works:
 
 >>> print(rewrap_value_string(u'yo, wassup?'))

test/test_class.hpp

@@ -4,17 +4,17 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 #ifndef TEST_CLASS_DWA2002326_HPP
 # define TEST_CLASS_DWA2002326_HPP
-# include <boost/assert.hpp>
+# include <boost/detail/lightweight_test.hpp>
 
 template <int n = 0>
 struct test_class
 {
     explicit test_class(int x) : x(x), magic(7654321 + n) { ++counter; }
     test_class(test_class const& rhs) : x(rhs.x), magic(7654321 + n) { ++counter; }
-    virtual ~test_class() { BOOST_ASSERT(magic == 7654321 + n); magic = 6666666; x = 9999; --counter; }
+    virtual ~test_class() { BOOST_TEST(magic == 7654321 + n); magic = 6666666; x = 9999; --counter; }
 
-    void set(int _x) { BOOST_ASSERT(magic == 7654321 + n); this->x = _x; }
-    int value() const { BOOST_ASSERT(magic == 7654321 + n); return x; }
+    void set(int _x) { BOOST_TEST(magic == 7654321 + n); this->x = _x; }
+    int value() const { BOOST_TEST(magic == 7654321 + n); return x; }
     operator int() const { return x; }
     static int count() { return counter; }
 

test/tuple.py

@@ -1,6 +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)
+from __future__ import print_function
 """
 >>> from tuple_ext import *
 >>> def printer(*args):
@@ -21,8 +22,6 @@
 ('hello', 42)
 """
 
-from __future__ import print_function
-
 def run(args = None):
     import sys
     import doctest
@@ -30,7 +29,7 @@ def run(args = None):
     if args is not None:
         sys.argv = args
     return doctest.testmod(sys.modules.get(__name__))
-
+    
 if __name__ == '__main__':
     print("running...")
     import sys