Skip to content

Only include platform-native data files for conda and menuinst #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcoesters merged 4 commits into from
Jan 29, 2026
Merged

Only include platform-native data files for conda and menuinst #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40c2178
Only package Windows activation files with Windows binary
marcoesters Jan 28, 2026
983fe18
Minimize data files for menuinst
marcoesters Jan 28, 2026
3929052
Add news file
marcoesters Jan 28, 2026
228dc27
Change function name for menuinst file collection
marcoesters Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions news/237-platform-data-files
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Enhancements

* Only include `conda` and `menuinst` data files for the native platform. (#237)

### Bug fixes

* <news item>

### Deprecations

* <news item>

### Docs

* <news item>

### Other

* <news item>
57 changes: 34 additions & 23 deletions src/conda.exe.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- mode: python ; coding: utf-8 -*-
import os
import platform
import site
import sys

Expand All @@ -9,6 +10,23 @@ from PyInstaller.utils.hooks import collect_data_files, collect_submodules, copy

from PyInstaller.utils.hooks import collect_submodules, copy_metadata


def get_menuinst_data_files() -> list[tuple[str, str]]:
"""Get sparse set of data files for menuinst to remove unneeded schemas and launchers."""
data_files = [
(os.path.join(sitepackages, 'menuinst', 'data', f'menuinst-{SCHEMA_VERSION}.default.json'), 'menuinst/data'),
(os.path.join(sitepackages, 'menuinst', 'data', f'menuinst-{SCHEMA_VERSION}.schema.json'), 'menuinst/data'),
]
if sys.platform == "darwin":
macos_arch = os.environ.get("OSX_ARCH", platform.machine())
data_files += [
(os.path.join(sitepackages, 'menuinst', 'data', f'osx_launcher_{macos_arch}'), 'menuinst/data'),
(os.path.join(sitepackages, 'menuinst', 'data', f'appkit_launcher_{macos_arch}'), 'menuinst/data'),
]
extra_exe_kwargs["entitlements_file"] = os.path.join(HERE, "entitlements.plist")
return data_files


# __file__ is not defined in the pyinstaller context,
# so we will get it from sys.argv instead
for arg in sys.argv:
Expand Down Expand Up @@ -53,39 +71,29 @@ datas = [
(os.path.join(sitepackages, 'archspec', 'vendor', 'cpuid', 'LICENSE'), 'archspec/vendor/cpuid'),
(os.path.join(sitepackages, 'conda', 'shell', 'bin', 'activate'), 'conda/shell/bin'),
(os.path.join(sitepackages, 'conda', 'shell', 'bin', 'deactivate'), 'conda/shell/bin'),
(os.path.join(sitepackages, 'conda', 'shell', 'cli-32.exe'), 'conda/shell'),
(os.path.join(sitepackages, 'conda', 'shell', 'cli-64.exe'), 'conda/shell'),
(os.path.join(sitepackages, 'conda', 'shell', 'conda_icon.ico'), 'conda/shell'),
(os.path.join(sitepackages, 'conda', 'shell', 'conda.xsh'), 'conda/shell'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', '_conda_activate.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'activate.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'conda_auto_activate.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'conda_hook.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'conda-hook.ps1'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'conda.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'Conda.psm1'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'deactivate.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'rename_tmp.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'etc', 'fish', 'conf.d', 'conda.fish'), 'conda/shell/etc/fish/conf.d'),
(os.path.join(sitepackages, 'conda', 'shell', 'etc', 'profile.d', 'conda.csh'), 'conda/shell/etc/profile.d'),
(os.path.join(sitepackages, 'conda', 'shell', 'etc', 'profile.d', 'conda.sh'), 'conda/shell/etc/profile.d'),
(os.path.join(sitepackages, 'conda', 'shell', 'Library', 'bin', 'conda.bat'), 'conda/shell/Library/bin'),
(os.path.join(sitepackages, 'conda', 'shell', 'Scripts', 'activate.bat'), 'conda/shell/Scripts'),
(os.path.join(sitepackages, 'menuinst', 'data', f'menuinst-{SCHEMA_VERSION}.default.json'), 'menuinst/data'),
(os.path.join(sitepackages, 'menuinst', 'data', f'menuinst-{SCHEMA_VERSION}.schema.json'), 'menuinst/data'),
]
if sys.platform == "win32":
datas += [
(os.path.join(os.getcwd(), 'entry_point_base.exe'), '.'),
(os.path.join(sitepackages, 'conda', 'shell', 'cli-32.exe'), 'conda/shell'),
(os.path.join(sitepackages, 'conda', 'shell', 'cli-64.exe'), 'conda/shell'),
(os.path.join(sitepackages, 'conda', 'shell', 'conda_icon.ico'), 'conda/shell'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', '_conda_activate.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'activate.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'conda_auto_activate.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'conda_hook.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'deactivate.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'rename_tmp.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'condabin', 'conda.bat'), 'conda/shell/condabin'),
(os.path.join(sitepackages, 'conda', 'shell', 'Library', 'bin', 'conda.bat'), 'conda/shell/Library/bin'),
(os.path.join(sitepackages, 'conda', 'shell', 'Scripts', 'activate.bat'), 'conda/shell/Scripts'),
]
elif sys.platform == "darwin":
datas += [
(os.path.join(sitepackages, 'menuinst', 'data', 'osx_launcher_arm64'), 'menuinst/data'),
(os.path.join(sitepackages, 'menuinst', 'data', 'osx_launcher_x86_64'), 'menuinst/data'),
(os.path.join(sitepackages, 'menuinst', 'data', 'appkit_launcher_arm64'), 'menuinst/data'),
(os.path.join(sitepackages, 'menuinst', 'data', 'appkit_launcher_x86_64'), 'menuinst/data'),
]
extra_exe_kwargs["entitlements_file"] = os.path.join(HERE, "entitlements.plist")

hiddenimports = []
packages = [
Expand Down Expand Up @@ -121,7 +129,10 @@ for name, module in conda_plugin_manager.list_name_plugin():
hiddenimports.extend(collect_submodules(package_name))
# collect_submodules does not look at __init__
hiddenimports.append(f"{package_name}.__init__")
datas.extend(collect_data_files(package_name))
if package_name == "menuinst":
datas.extend(get_menuinst_data_files())
else:
datas.extend(collect_data_files(package_name))
# metadata is needed for conda to find the plug-in
datas.extend(copy_metadata(package_name))

Expand Down
Loading