setup MSVC in action

jfolz · Sep 3, 2024 · e88b000 · e88b000
1 parent 6de5bc9
commit e88b000
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -24,6 +24,9 @@ jobs:
         uses: docker/[email protected]
         with:
           platforms: arm64
+      - name: Set up MSVC
+        if: runner.os == 'Windows'
+        uses: ilammy/msvc-dev-cmd@v1
       - name: Build wheels
         uses: pypa/[email protected]
         env:

diff --git a/pyproject.toml b/pyproject.toml
@@ -39,7 +39,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]
 environment = "PIP_ONLY_BINARY=:all:"
-skip = "*_i686 pp* *musllinux* cp{31[!01],3[!01]?,[!3]*}-win32"
+skip = "*_i686 pp* *musllinux* *-win32"
 build-verbosity = 1
 test-requires = "pytest>=5.3.2 numpy Pillow>=7.0.0"
 test-command = "pytest {project}/test -vv"
diff --git a/setup.py b/setup.py
@@ -35,13 +35,15 @@ def __repr__(self):
 WINDOWS_ARCH_MAP_32bit = {
     'x86': 'x86',
     'x86_64': 'x86',
+    'x64': 'x86',
     'amd64': 'x86',
     'AMD64': 'x86',
 }
 
 
 WINDOWS_ARCH_MAP_64bit = {
     'x86_64': 'AMD64',
+    'x64': 'AMD64',
     'amd64': 'AMD64',
     'AMD64': 'AMD64',
 }
@@ -150,7 +152,8 @@ def build_cmake_dependencies(self):
             if ARCHFLAGS:
                 flags.append("-DCMAKE_OSX_ARCHITECTURES=" + ";".join(ARCHFLAGS))
         if OS == 'windows':
-            update_env_msvc()
+            #update_env_msvc()
+            pass
         self.build_cmake_dependency(YASM_DIR, [
             '-DBUILD_SHARED_LIBS=OFF'
         ])