Upgrade workflow actions on Windows.

.github/workflows/test-osx.yml

@@ -32,19 +32,17 @@ jobs:
         faber -v
         sed -e "s/\$PYTHON/python/g" .ci/faber > ~/.faber
         faber \
-          --with-boost-include=$(brew --prefix boost)/include \
+          --with-boost-include=/opt/homebrew/Cellar/boost/1.86.0/include \
           --builddir=build \
           cxx.name=${{ matrix.cxx }} \
           cxxflags=-std=${{ matrix.std }} \
-          cppflags=-std=${{ matrix.std }} \
           -j`sysctl -n hw.ncpu`
     - name: test
       run: |
         faber \
-          --with-boost-include=$(brew --prefix boost)/include \
+          --with-boost-include=/opt/homebrew/Cellar/boost/1.86.0/include \
           --builddir=build\
           cxx.name=${{ matrix.cxx }} \
           cxxflags=-std=${{ matrix.std }} \
-          cppflags=-std=${{ matrix.std }} \
           -j`sysctl -n hw.ncpu` \
           test.report

.github/workflows/test-ubuntu.yml

@@ -39,7 +39,6 @@ jobs:
           --builddir=build \
           cxx.name=${{ matrix.cxx }} \
           cxxflags=-std=${{ matrix.std }} \
-          cppflags=-std=${{ matrix.std }} \
           -j`nproc`
     - name: test
       run: |
@@ -48,6 +47,5 @@ jobs:
           --builddir=build \
           cxx.name=${{ matrix.cxx }} \
           cxxflags=-std=${{ matrix.std }} \
-          cppflags=-std=${{ matrix.std }} \
           -j`nproc` \
           test.report

.github/workflows/test-windows.yml

@@ -15,9 +15,9 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: microsoft/setup-msbuild@v1.1
+    - uses: microsoft/setup-msbuild@v2
     - name: setup boost prerequisites
-      uses: lukka/run-vcpkg@v6
+      uses: lukka/run-vcpkg@v11
       with:
         vcpkgGitCommitId: '88b1071e39f13b632644d9d953738d345a4ac055'
         vcpkgDirectory: '${{ runner.workspace }}/vcpkg'

doc/numpy/_static/boost.css

@@ -714,23 +714,3 @@ span.purple { color: purple; }
 span.gold { color: gold; }
 span.silver { color: silver; } /* lighter gray */
 span.gray { color: #808080; } /* light gray */
-
-/* 2022 fix */
-
-ol.simple ol p,
-ol.simple ul p,
-ul.simple ol p,
-ul.simple ul p {
-    margin-top: 0;
-}
-
-ol.simple > li:not(:first-child) > p,
-ul.simple > li:not(:first-child) > p {
-    margin-top: 0;
-}
-
-ol.simple p,
-ul.simple p {
-    margin-bottom: 0;
-}
-

doc/numpy/_templates/layout.html

@@ -49,9 +49,6 @@
     {%- for scriptfile in script_files %}
     <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
     {%- endfor %}
-    <script data-url_root="{{ pathto('', 1) }}" id="documentation_options" src="{{ pathto('', 1) }}_static/documentation_options.js"></script>
-    <script src="{{ pathto('', 1) }}_static/searchtools.js"></script>
-    <script src="{{ pathto('', 1) }}_static/language_data.js"></script>
     {%- if use_opensearch %}
     <link rel="search" type="application/opensearchdescription+xml"
           title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"

include/boost/python/object_operators.hpp

@@ -9,7 +9,7 @@
 
 # include <boost/python/object_core.hpp>
 # include <boost/python/call.hpp>
-# include <boost/type_traits/enable_if.hpp>
+# include <boost/iterator/detail/enable_if.hpp>
 # include <boost/mpl/bool.hpp>
 
 # include <boost/iterator/detail/config_def.hpp>
@@ -40,7 +40,7 @@ struct is_object_operators
 # if !defined(BOOST_NO_SFINAE) && !defined(BOOST_NO_IS_CONVERTIBLE)
 template <class L, class R, class T>
 struct enable_binary
-  : boost::enable_if_<is_object_operators<L,R>::value, T>
+  : boost::iterators::enable_if<is_object_operators<L,R>, T>
 {};
 #  define BOOST_PYTHON_BINARY_RETURN(T) typename enable_binary<L,R,T>::type
 # else