Support 32-bit windows for conda-unpack.exe

johanjeppsson · Sep 24, 2019 · eb76175 · eb76175
1 parent 52daedd
commit eb76175
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/conda_pack/compat.py b/conda_pack/compat.py
@@ -1,7 +1,9 @@
+import os
 import sys
 
 default_encoding = sys.getdefaultencoding()
 on_win = sys.platform == 'win32'
+is_32bit = sys.maxsize < 2**32 or os.environ.get('CONDA_FORCE_32BIT', '0') == '1'
 
 PY2 = sys.version_info.major == 2
 

diff --git a/conda_pack/core.py b/conda_pack/core.py
@@ -14,7 +14,7 @@
 from contextlib import contextmanager
 from fnmatch import fnmatch
 
-from .compat import on_win, default_encoding, find_py_source
+from .compat import on_win, default_encoding, find_py_source, is_32bit
 from .prefixes import SHEBANG_REGEX, replace_prefix
 from ._progress import progressbar
 
@@ -1021,5 +1021,6 @@ def finish(self):
             os.unlink(fil.name)
 
         if on_win:
-            cli_exe = pkg_resources.resource_filename('setuptools', 'cli-64.exe')
+            exe = 'cli-32.exe' if is_32bit else 'cli-64.exe'
+            cli_exe = pkg_resources.resource_filename('setuptools', exe)
             self.archive.add(cli_exe, os.path.join(BIN_DIR, 'conda-unpack.exe'))