Skip to content

Commit

Permalink
refactor(deps): update pyoxidizer.bzl and nox_actions/release.py
Browse files Browse the repository at this point in the history 
- Remove unnecessary comments and settings from pyoxidizer.bzl
- Add cleanup for site_package_dir/bin in nox_actions/release.py

Signed-off-by: loonghao <hal.long@outlook.com>
  • Loading branch information
@loonghao
loonghao committed Nov 8, 2024
1 parent f8bc71e commit 4530215
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 177 deletions.
2 changes: 2 additions & 0 deletions nox_actions/release.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ def build_exe(session: nox.Session) -> None:
for platform_name in os.listdir(build_root):
platform_dir = build_root / platform_name / "release" / "install"
site_package_dir = platform_dir / "lib" / "site-packages"


shutil.rmtree(site_package_dir / "bin")
print(os.listdir(platform_dir))
print(f"build {platform_name}")
Expand Down
179 changes: 2 additions & 177 deletions pyoxidizer.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,61 +33,14 @@ def make_exe():
# policy.bytecode_optimize_level_one = True
policy.bytecode_optimize_level_two = True

# Package all available Python extensions in the distribution.
# policy.extension_module_filter = "all"

# Package the minimum set of Python extensions in the distribution needed
# to run a Python interpreter. Various functionality from the Python
# standard library won't work with this setting! But it can be used to
# reduce the size of generated executables by omitting unused extensions.
# policy.extension_module_filter = "minimal"

# Package Python extensions in the distribution not having additional
# library dependencies. This will exclude working support for SSL,
# compression formats, and other functionality.
# policy.extension_module_filter = "no-libraries"

# Package Python extensions in the distribution not having a dependency on
# copyleft licensed software like GPL.
# policy.extension_module_filter = "no-copyleft"

# Controls whether the file scanner attempts to classify files and emit
# resource-specific values.
# policy.file_scanner_classify_files = True

# Controls whether `File` instances are emitted by the file scanner.
# policy.file_scanner_emit_files = False

# Controls the `add_include` attribute of "classified" resources
# (`PythonModuleSource`, `PythonPackageResource`, etc).
# policy.include_classified_resources = True

# Toggle whether Python module source code for modules in the Python
# distribution's standard library are included.
# policy.include_distribution_sources = False

# Toggle whether Python package resource files for the Python standard
# library are included.
# policy.include_distribution_resources = False

# Controls the `add_include` attribute of `File` resources.
# policy.include_file_resources = False

# Controls the `add_include` attribute of `PythonModuleSource` not in
# the standard library.
# policy.include_non_distribution_sources = True

# Toggle whether files associated with tests are included.
# policy.include_test = False

# Resources are loaded from "in-memory" or "filesystem-relative" paths.
# The locations to attempt to add resources to are defined by the
# `resources_location` and `resources_location_fallback` attributes.
# The former is the first/primary location to try and the latter is
# an optional fallback.

# Use in-memory location for adding resources by default.
# policy.resources_location = "in-memory"
policy.resources_location = "in-memory"

# Use filesystem-relative location for adding resources by default.
# policy.resources_location = "filesystem-relative:prefix"
Expand All @@ -96,26 +49,11 @@ def make_exe():
# `resources_location` fails.
policy.resources_location_fallback = "filesystem-relative:lib"

# Clear out a fallback resource location.
# policy.resources_location_fallback = None

# Define a preferred Python extension module variant in the Python distribution
# to use.
# policy.set_preferred_extension_module_variant("foo", "bar")

# Configure policy values to classify files as typed resources.
# (This is the default.)
# policy.set_resource_handling_mode("classify")

# Configure policy values to handle files as files and not attempt
# to classify files as specific types.
policy.set_resource_handling_mode("files")

# This variable defines the configuration of the embedded Python
# interpreter. By default, the interpreter will run a Python REPL
# using settings that are appropriate for an "isolated" run-time
# environment.
#

# The configuration of the embedded Python interpreter can be modified
# by setting attributes on the instance. Some of these are
# documented below.
Expand All @@ -128,77 +66,10 @@ def make_exe():
# a value, it will be expanded to the directory of the built executable.
python_config.module_search_paths = ["$ORIGIN/lib", "$ORIGIN/lib/site-packages"]

# Use jemalloc as Python's memory allocator.
# python_config.allocator_backend = "jemalloc"

# Use mimalloc as Python's memory allocator.
# python_config.allocator_backend = "mimalloc"

# Use snmalloc as Python's memory allocator.
# python_config.allocator_backend = "snmalloc"

# Let Python choose which memory allocator to use. (This will likely
# use the malloc()/free() linked into the program.
# python_config.allocator_backend = "default"

# Enable the use of a custom allocator backend with the "raw" memory domain.
# python_config.allocator_raw = True

# Enable the use of a custom allocator backend with the "mem" memory domain.
# python_config.allocator_mem = True

# Enable the use of a custom allocator backend with the "obj" memory domain.
# python_config.allocator_obj = True

# Enable the use of a custom allocator backend with pymalloc's arena
# allocator.
# python_config.allocator_pymalloc_arena = True

# Enable Python memory allocator debug hooks.
# python_config.allocator_debug = True

# Automatically calls `multiprocessing.set_start_method()` with an
# appropriate value when OxidizedFinder imports the `multiprocessing`
# module.
# python_config.multiprocessing_start_method = 'auto'

# Do not call `multiprocessing.set_start_method()` automatically. (This
# is the default behavior of Python applications.)
# python_config.multiprocessing_start_method = 'none'

# Call `multiprocessing.set_start_method()` with explicit values.
# python_config.multiprocessing_start_method = 'fork'
# python_config.multiprocessing_start_method = 'forkserver'
# python_config.multiprocessing_start_method = 'spawn'

# Control whether `oxidized_importer` is the first importer on
# `sys.meta_path`.
# python_config.oxidized_importer = False

# Enable the standard path-based importer which attempts to load
# modules from the filesystem.
# python_config.filesystem_importer = True

# Set `sys.frozen = False`
# python_config.sys_frozen = False

# Set `sys.meipass`
# python_config.sys_meipass = True

# Write files containing loaded modules to the directory specified
# by the given environment variable.
# python_config.write_modules_directory_env = "/tmp/oxidized/loaded_modules"

# Evaluate a string as Python code when the interpreter starts.
# python_config.run_command = "<code>"

# Run a Python module as __main__ when the interpreter starts.
python_config.run_module = "portable_rez"
python_config.parse_argv = True

# Run a Python file when the interpreter starts.
# python_config.run_filename = "portable_rez/__main__.py"

# Produce a PythonExecutable from a Python distribution, embedded
# resources, and other options. The returned object represents the
# standalone executable that will be built.
Expand All @@ -213,58 +84,12 @@ def make_exe():
config=python_config,
)

# Install tcl/tk support files to a specified directory so the `tkinter` Python
# module works.
# exe.tcl_files_path = "lib"

# Never attempt to copy Windows runtime DLLs next to the built executable.
# exe.windows_runtime_dlls_mode = "never"

# Copy Windows runtime DLLs next to the built executable when they can be
# located.
# exe.windows_runtime_dlls_mode = "when-present"

# Copy Windows runtime DLLs next to the build executable and error if this
# cannot be done.
# exe.windows_runtime_dlls_mode = "always"

# Make the executable a console application on Windows.
# exe.windows_subsystem = "console"

# Make the executable a non-console application on Windows.
# exe.windows_subsystem = "windows"

# Invoke `pip download` to install a single package using wheel archives
# obtained via `pip download`. `pip_download()` returns objects representing
# collected files inside Python wheels. `add_python_resources()` adds these
# objects to the binary, with a load location as defined by the packaging
# policy's resource location attributes.
#exe.add_python_resources(exe.pip_download(["pyflakes==2.2.0"]))

# Invoke `pip install` using a requirements file and add the collected resources
# to our binary.
for resource in exe.pip_install([CWD]):
resource.add_location = "filesystem-relative:lib/site-packages"
exe.add_python_resource(resource)

# Read Python files from a local directory and add them to our embedded
# context, taking just the resources belonging to the `foo` and `bar`
# Python packages.
#exe.add_python_resources(exe.read_package_root(
# path="/src/mypackage",
# packages=["foo", "bar"],
#))

# Discover Python files from a virtualenv and add them to our embedded
# context.
#exe.add_python_resources(exe.read_virtualenv(path="/path/to/venv"))

# Filter all resources collected so far through a filter of names
# in a file.
#exe.filter_resources_from_files(files=["/path/to/filter-file"])

# Return our `PythonExecutable` instance so it can be built and
# referenced by other consumers of this target.
return exe

def make_embedded_resources(exe):
Expand Down

0 comments on commit 4530215

Please sign in to comment.