Skip to content

Commit

Permalink
try specifying windows sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
minrk committed Jan 15, 2021
1 parent fa92171 commit 6666363
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6666363

Please sign in to comment.