Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
maresb committed Sep 15, 2024
1 parent 944d8a4 commit c9828d7
Show file tree
Hide file tree
Showing 9 changed files with 232 additions and 59 deletions.
6 changes: 5 additions & 1 deletion conda_lock/conda_lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -1375,7 +1375,11 @@ def lock(
logging.basicConfig(level=log_level)

# Set Pypi <--> Conda lookup file location
mapping_url = DEFAULT_MAPPING_URL if pypi_to_conda_lookup_file is None else pypi_to_conda_lookup_file
mapping_url = (
DEFAULT_MAPPING_URL
if pypi_to_conda_lookup_file is None
else pypi_to_conda_lookup_file
)

metadata_enum_choices = set(MetadataOption(md) for md in metadata_choices)

Expand Down
7 changes: 5 additions & 2 deletions conda_lock/lockfile/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ def extract_planned_items(
return [
item
for item in planned_items
if dep_name(manager=item.manager, dep=item.name, mapping_url=mapping_url) not in deps
if dep_name(manager=item.manager, dep=item.name, mapping_url=mapping_url)
not in deps
]

def dep_name(*, manager: str, dep: str, mapping_url: str) -> str:
Expand All @@ -125,7 +126,9 @@ def dep_name(*, manager: str, dep: str, mapping_url: str) -> str:

for planned_item in planned_items:
todo.extend(
dep_name(manager=planned_item.manager, dep=dep, mapping_url=mapping_url)
dep_name(
manager=planned_item.manager, dep=dep, mapping_url=mapping_url
)
for dep in planned_item.dependencies
# exclude virtual packages
if not (dep in deps or dep.startswith("__"))
Expand Down
11 changes: 9 additions & 2 deletions conda_lock/pypi_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,9 @@ def solve_pypi(
if locked_dep.manager != "pip" and "python" not in locked_dep.dependencies:
continue
try:
pypi_name = conda_name_to_pypi_name(locked_dep.name, mapping_url=mapping_url).lower()
pypi_name = conda_name_to_pypi_name(
locked_dep.name, mapping_url=mapping_url
).lower()
except KeyError:
continue
# Prefer the Python package when its name collides with the Conda package
Expand Down Expand Up @@ -580,7 +582,12 @@ def solve_pypi(
else:
planned[pypi_name] = [locked_dep]

apply_categories(requested=pip_specs, planned=planned, convert_to_pip_names=True, mapping_url=mapping_url)
apply_categories(
requested=pip_specs,
planned=planned,
convert_to_pip_names=True,
mapping_url=mapping_url,
)

return {dep.name: dep for dep in requirements}

Expand Down
22 changes: 14 additions & 8 deletions conda_lock/src_parser/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@ def _parse_platforms_from_srcs(src_files: List[pathlib.Path]) -> List[str]:


def _parse_source_files(
src_files: List[pathlib.Path],
*,
platforms: List[str],
mapping_url: str
src_files: List[pathlib.Path], *, platforms: List[str], mapping_url: str
) -> List[LockSpecification]:
"""
Parse a sequence of dependency specifications from source files
Expand All @@ -68,9 +65,17 @@ def _parse_source_files(
if src_file.name == "meta.yaml":
desired_envs.append(parse_meta_yaml_file(src_file, platforms=platforms))
elif src_file.name == "pyproject.toml":
desired_envs.append(parse_pyproject_toml(src_file, platforms=platforms, mapping_url=mapping_url))
desired_envs.append(
parse_pyproject_toml(
src_file, platforms=platforms, mapping_url=mapping_url
)
)
else:
desired_envs.append(parse_environment_file(src_file, platforms=platforms, mapping_url=mapping_url))
desired_envs.append(
parse_environment_file(
src_file, platforms=platforms, mapping_url=mapping_url
)
)
return desired_envs


Expand All @@ -82,7 +87,6 @@ def make_lock_spec(
platform_overrides: Optional[Sequence[str]] = None,
required_categories: Optional[AbstractSet[str]] = None,
mapping_url: str,

) -> LockSpecification:
"""Generate the lockfile specs from a set of input src_files. If required_categories is set filter out specs that do not match those"""
platforms = (
Expand All @@ -91,7 +95,9 @@ def make_lock_spec(
else _parse_platforms_from_srcs(src_files)
) or DEFAULT_PLATFORMS

lock_specs = _parse_source_files(src_files, platforms=platforms, mapping_url=mapping_url)
lock_specs = _parse_source_files(
src_files, platforms=platforms, mapping_url=mapping_url
)

aggregated_lock_spec = aggregate_lock_specs(lock_specs, platforms)

Expand Down
8 changes: 6 additions & 2 deletions conda_lock/src_parser/environment_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ def _parse_environment_file_for_platform(
dependencies.append(dependency)

# ensure pip is in target env
dependencies.append(parse_python_requirement("pip", manager="conda", mapping_url=mapping_url))
dependencies.append(
parse_python_requirement("pip", manager="conda", mapping_url=mapping_url)
)

return dependencies

Expand Down Expand Up @@ -134,7 +136,9 @@ def parse_environment_file(

# Parse with selectors for each target platform
dep_map = {
platform: _parse_environment_file_for_platform(content, category=category, platform=platform, mapping_url=mapping_url)
platform: _parse_environment_file_for_platform(
content, category=category, platform=platform, mapping_url=mapping_url
)
for platform in platforms
}

Expand Down
14 changes: 11 additions & 3 deletions conda_lock/src_parser/pyproject_toml.py
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,10 @@ def parse_requirements_pyproject_toml(
for dep in get_in(list(path), contents, []):
dependencies.append(
parse_python_requirement(
dep, manager=default_non_conda_source, category=category, mapping_url=mapping_url
dep,
manager=default_non_conda_source,
category=category,
mapping_url=mapping_url,
)
)

Expand Down Expand Up @@ -650,7 +653,10 @@ def parse_pdm_pyproject_toml(
dev_reqs.extend(
[
parse_python_requirement(
dep, manager=default_non_conda_source, category="dev", mapping_url=mapping_url
dep,
manager=default_non_conda_source,
category="dev",
mapping_url=mapping_url,
)
for dep in deps
]
Expand Down Expand Up @@ -734,4 +740,6 @@ def parse_pyproject_toml(
"Could not detect build-system in pyproject.toml. Assuming poetry"
)

return parse(pyproject_toml, platforms=platforms, contents=contents, mapping_url=mapping_url)
return parse(
pyproject_toml, platforms=platforms, contents=contents, mapping_url=mapping_url
)
Loading

0 comments on commit c9828d7

Please sign in to comment.