diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ebe68081e..48ed3c788 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -61,7 +61,7 @@ jobs: CIBW_ENVIRONMENT_MACOS: "ZMQ_PREFIX=/usr/local" CIBW_ENVIRONMENT_LINUX: "ZMQ_PREFIX=/usr/local" - CIBW_ENVIRONMENT_WINDOWS: "PYZMQ_BUNDLE_CRT=1" + CIBW_ENVIRONMENT_WINDOWS: "PYZMQ_BUNDLE_CRT=1 DISTUTILS_USE_SDK=1 MSSdk=1" CIBW_TEST_REQUIRES: "pytest" CIBW_TEST_COMMAND: "pytest -vsx --pyargs zmq.tests.test_wheel" @@ -92,11 +92,13 @@ jobs: - os: windows-2016 name: win32 + arch: x86 cibw: build: "*win32" - os: windows-2016 name: win_amd64 + arch: amd64 cibw: build: "*win_amd64" @@ -127,6 +129,13 @@ jobs: run: | pip freeze + - name: setup VC++ dev env + if: startsWith(matrix.os, 'win') + uses: ilammy/msvc-dev-cmd@v1 + with: + sdk: 7.1 + arch: ${{ matrix.arch }} + - name: show vcvars if: startsWith(matrix.os, 'win') run: | diff --git a/setup.py b/setup.py index df13f185c..22f582dca 100755 --- a/setup.py +++ b/setup.py @@ -685,7 +685,7 @@ def bundle_libzmq_extension(self): vcruntime = vcvars["py_vcruntime_redist"] except KeyError: warn(f"platform={get_platform()}, vcvars=") - pprint.pprint(vcvars, stream=sys.stderr) + pprint(vcvars, stream=sys.stderr) # fatal error if env set, warn otherwise msg = fatal if os.environ.get("PYZMQ_BUNDLE_CRT") else warn