merged RC_1_2 into RC_2_0

.github/workflows/cibuildwheel.yml

@@ -103,7 +103,7 @@ jobs:
     - uses: docker/setup-qemu-action@v1
       if: steps.cache-wheel.outputs.cache-hit != 'true' && runner.os == 'Linux'
 
-    - uses: pypa/cibuildwheel@v2.2.2
+    - uses: pypa/cibuildwheel@v2.9.0
       if: steps.cache-wheel.outputs.cache-hit != 'true'
 
     - uses: actions/upload-artifact@v2

.github/workflows/python.yml

@@ -29,7 +29,6 @@ jobs:
       run: |
         brew update
         brew install boost-build boost boost-python3 python@3.10 openssl@1.1
-        echo "using darwin ;" >>~/user-config.jam
         export PATH=$(brew --prefix)/opt/python@3.10/bin:$PATH
 
     - name: update package lists (linux)

bindings/python/setup.py

@@ -358,6 +358,12 @@ class LibtorrentBuildExt(build_ext_lib.build_ext):
             self._maybe_add_arg("--debug-building")
             self._maybe_add_arg("--debug-generators")
 
+        if sys.platform == "darwin":
+            # boost.build defaults to toolset=clang on mac. However python.jam
+            # on boost 1.77+ breaks with toolset=clang if using a framework-type
+            # python installation, such as installed by homebrew.
+            self._maybe_add_arg("toolset=darwin")
+
         # Default feature configuration
         self._maybe_add_arg("deprecated-functions=on")
         self._maybe_add_arg("boost-link=static")
@@ -447,7 +453,7 @@ class LibtorrentBuildExt(build_ext_lib.build_ext):
             yield
 
 
-class InstallDataToLibDir(install_data_lib.install_data):  # type: ignore
+class InstallDataToLibDir(install_data_lib.install_data):
     def finalize_options(self) -> None:
         # install_data installs to the *base* directory, which is useless.
         # Nothing ever gets installed there, no tools search there. You could

pyproject.toml

@@ -2,7 +2,7 @@
 requires-python = ">=3.7"
 
 [tool.cibuildwheel]
-skip = "pp*"
+skip = "{pp*,cp311-*}"
 
 [tool.cibuildwheel.macos]
 before-all = [