Skip to content

Commit

Permalink
Remove the various prefix options from the lock file renderer
Browse files Browse the repository at this point in the history
These seem mostly useless configuration options. And there are now things (e.g. package_repo)
that depend on the default values. Repo prefixes are still configurable in generated lock files, since
repos occupy a shared, global namespace.
  • Loading branch information
jvolkman committed Jan 23, 2024
1 parent 81e485a commit 7b0d375
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 74 deletions.
28 changes: 0 additions & 28 deletions pycross/private/lock_attrs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -95,22 +95,6 @@ RENDER_ATTRS = dict(
doc = "The prefix to apply to repository targets. Defaults to the lock file target name.",
default = "",
),
build_prefix = attr.string(
doc = "The prefix to apply to package build targets.",
default = "_build",
),
wheel_prefix = attr.string(
doc = "The prefix to apply to package wheel targets.",
default = "_wheel",
),
sdist_prefix = attr.string(
doc = "The prefix to apply to package sdist targets.",
default = "_sdist",
),
environment_prefix = attr.string(
doc = "The prefix to apply to environment targets.",
default = "_env",
),
generate_file_map = attr.bool(
doc = "Generate a FILES dict containing a mapping of filenames to repo labels.",
),
Expand Down Expand Up @@ -241,18 +225,6 @@ def handle_render_attrs(attrs):

args.extend(["--repo-prefix", repo_prefix])

if attrs.wheel_prefix:
args.extend(["--wheel-prefix", attrs.wheel_prefix])

if attrs.build_prefix:
args.extend(["--build-prefix", attrs.build_prefix])

if attrs.sdist_prefix:
args.extend(["--sdist-prefix", attrs.sdist_prefix])

if attrs.environment_prefix:
args.extend(["--environment-prefix", attrs.environment_prefix])

if attrs.generate_file_map:
args.append("--generate-file-map")

Expand Down
44 changes: 4 additions & 40 deletions pycross/private/tools/resolved_lock_renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,34 +87,26 @@ class QualifiedTargetRef(TargetRef):
class Naming:
def __init__(
self,
build_prefix: Optional[str],
sdist_prefix: Optional[str],
wheel_prefix: Optional[str],
environment_prefix: Optional[str],
repo_prefix: Optional[str],
target_environment_select: str,
):
self.build_prefix = build_prefix
self.sdist_prefix = sdist_prefix
self.wheel_prefix = wheel_prefix
self.environment_prefix = environment_prefix
self.repo_prefix = repo_prefix
self.target_environment_select = target_environment_select

def package(self, package_key: PackageKey) -> TargetRef:
return TargetRef(str(package_key))

def environment(self, environment_name: str) -> TargetRef:
return TargetRef(prefixed(environment_name, self.environment_prefix))
return TargetRef(prefixed(environment_name, "_env"))

def wheel_build(self, package_key: PackageKey) -> TargetRef:
return TargetRef(prefixed(str(package_key), self.build_prefix))
return TargetRef(prefixed(str(package_key), "_build"))

def wheel(self, package_key: PackageKey) -> TargetRef:
return TargetRef(prefixed(str(package_key), self.wheel_prefix))
return TargetRef(prefixed(str(package_key), "_wheel"))

def sdist(self, package_key: PackageKey) -> TargetRef:
return TargetRef(prefixed(str(package_key), self.sdist_prefix))
return TargetRef(prefixed(str(package_key), "_sdist"))

def repo_file(self, file: PackageFile) -> QualifiedTargetRef:
name = file.name
Expand Down Expand Up @@ -475,10 +467,6 @@ def gen_load_statements(imports: Set[str], pycross_repo: str) -> List[str]:
def render(resolved_lock: ResolvedLockSet, args: Any, output: TextIO) -> None:
naming = Naming(
repo_prefix=args.repo_prefix,
build_prefix=args.build_prefix,
sdist_prefix=args.sdist_prefix,
wheel_prefix=args.wheel_prefix,
environment_prefix=args.environment_prefix,
target_environment_select="_target",
)

Expand Down Expand Up @@ -637,30 +625,6 @@ def add_shared_flags(parser: ArgumentParser) -> None:
help="The prefix to apply to repository targets.",
)

parser.add_argument(
"--build-prefix",
default="_build",
help="The prefix to apply to package build targets.",
)

parser.add_argument(
"--sdist-prefix",
default="_sdist",
help="The prefix to apply to package sdist targets.",
)

parser.add_argument(
"--wheel-prefix",
default="_wheel",
help="The prefix to apply to package wheel targets.",
)

parser.add_argument(
"--environment-prefix",
default="_env",
help="The prefix to apply to packages environment targets.",
)

parser.add_argument(
"--pypi-index",
help="The PyPI-compatible index to use. Defaults to pypi.org.",
Expand Down
12 changes: 6 additions & 6 deletions tests/smoke_bzlmod/MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7b0d375

Please sign in to comment.