diff --git a/.github/workflows/build_python.yml b/.github/workflows/build_python.yml index a0ecce12f9..241548dae3 100644 --- a/.github/workflows/build_python.yml +++ b/.github/workflows/build_python.yml @@ -51,6 +51,7 @@ jobs: if: ${{ runner.os == 'macOS' }} with: compiler: gcc + version: 12 # Copied from https://github.com/scipy/scipy/blob/main/.github/workflows/wheels.yml # For rtools, see https://github.com/r-windows/rtools-installer/releases, which has been diff --git a/pyproject.toml b/pyproject.toml index a8fdeea31b..ddb4c6378b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -52,3 +52,6 @@ skip = [ # As such we can compile but we cannot test, so we skip those. "cp31*-manylinux_i686", ] + +[tool.cibuildwheel.macos.environment] +MACOSX_DEPLOYMENT_TARGET = "11" \ No newline at end of file diff --git a/python/pybind11 b/python/pybind11 index 8a099e44b3..3e9dfa2866 160000 --- a/python/pybind11 +++ b/python/pybind11 @@ -1 +1 @@ -Subproject commit 8a099e44b3d5f85b20f05828d919d2332a8de841 +Subproject commit 3e9dfa2866941655c56877882565e7577de6fc7b diff --git a/python/tests/test_compatibility_pdfo.py b/python/tests/test_compatibility_pdfo.py index 6eaaaf6cd5..9ecfc90c06 100644 --- a/python/tests/test_compatibility_pdfo.py +++ b/python/tests/test_compatibility_pdfo.py @@ -20,6 +20,9 @@ def test_pdfo(): scipy = pytest.importorskip("scipy") if version.parse(scipy.__version__) < version.parse("1.11.0"): pytest.skip("scipy version too old for this test (its version of COBYLA does not accept bounds)") + numpy = pytest.importorskip("numpy") + if version.parse(numpy.__version__) >= version.parse("2.0.0"): + pytest.skip("numpy version too new for this test (pdfo does not yet support numpy v2)") from pdfo import pdfo from scipy.optimize import NonlinearConstraint as NLC, LinearConstraint as LC, Bounds