bump cibuildwheel action to v2.17.0

.github/workflows/cibuildwheel.yml

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

.github/workflows/python.yml

@@ -68,16 +68,6 @@ jobs:
  cd boost
  .\b2 headers
 
- - name: install openssl (windows)
- if: runner.os == 'Windows'
- uses: nick-fields/retry@v3
- with:
- shell: cmd
- timeout_minutes: 5
- retry_wait_seconds: 4
- max_attempts: 3
- command: choco install openssl --limitoutput --no-progress
-
  - name: build/install (windows)
  if: runner.os == 'Windows'
  shell: cmd

bindings/python/setup.py

@@ -97,7 +97,10 @@ def b2_escape(value: str) -> str:
 
 
 def write_b2_python_config(
- include_dirs: Sequence[str], library_dirs: Sequence[str], config: IO[str]
+ include_dirs: Sequence[str],
+ library_dirs: Sequence[str],
+ ext_suffix: str,
+ config: IO[str],
 ) -> None:
  write = config.write
  # b2 keys python environments by X.Y version, breaking ties by matching
@@ -150,9 +153,6 @@ def write_b2_python_config(
  # other words we apply debian's override everywhere, and hope no other
  # overrides ever disagree with us.
 
- ext_suffix = sysconfig.get_config_var("EXT_SUFFIX")
- ext_suffix = str(ext_suffix or "")
-
  # python.jam appends the platform-specific final suffix on its own. I can't
  # find a consistent value from sysconfig for this.
  for plat_suffix in (".pyd", ".dll", ".so", ".sl"):
@@ -428,7 +428,10 @@ def _configure_b2_with_distutils(self) -> Iterator[None]:
  if self._maybe_add_arg(f"python={sysconfig.get_python_version()}"):
  config_writers.append(
  functools.partial(
- write_b2_python_config, self.include_dirs, self.library_dirs
+ write_b2_python_config,
+ self.include_dirs,
+ self.library_dirs,
+ os.path.basename(self.get_ext_fullpath("")),
  )
  )
 

pyproject.toml

@@ -62,15 +62,13 @@ PATH = "/usr/lib/ccache/bin:/tmp/boost:$PATH"
 
 [[tool.cibuildwheel.overrides]]
 before-all = [
- "bash -c './tools/cibuildwheel/setup_boost.sh $BOOST_VERSION $BOOST_ROOT'",
- "bash -c 'choco install --no-progress --x86 openssl'" # choco only allows EITHER 32 OR 64-bit version of a package
+ "bash -c './tools/cibuildwheel/setup_boost.sh $BOOST_VERSION $BOOST_ROOT'"
 ]
 select = "*-win32"
 
 [[tool.cibuildwheel.overrides]]
 before-all = [
- "bash -c './tools/cibuildwheel/setup_boost.sh $BOOST_VERSION $BOOST_ROOT'",
- "bash -c 'choco install --no-progress openssl'" # choco only allows EITHER 32 OR 64-bit version of a package
+ "bash -c './tools/cibuildwheel/setup_boost.sh $BOOST_VERSION $BOOST_ROOT'"
 ]
 select = "*-win_amd64"