Skip to content

Commit

Permalink
Use mamba env export differently: --no-build(s) and no --json
Browse files Browse the repository at this point in the history
  • Loading branch information
mathbunnyru committed Oct 2, 2024
1 parent 640938b commit 3634797
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ repos:
"requests",
"urllib3",
"types-beautifulsoup4",
"types-PyYAML",
"types-requests",
"types-tabulate",
"types-urllib3",
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ pytest-retry
# `pytest-xdist` is a plugin that provides the `--numprocesses` flag,
# allowing us to run `pytest` tests in parallel
pytest-xdist
PyYAML
requests
tabulate
18 changes: 9 additions & 9 deletions tests/package_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.

import json
import logging
import re
from collections import defaultdict
from itertools import chain
from typing import Any, Optional

import yaml
from docker.models.containers import Container
from tabulate import tabulate

Expand Down Expand Up @@ -61,7 +61,7 @@ def start_container(container: TrackedContainer) -> Container:
@staticmethod
def _conda_export_command(from_history: bool) -> list[str]:
"""Return the mamba export command with or without history"""
cmd = ["mamba", "env", "export", "-n", "base", "--json", "--no-builds"]
cmd = ["mamba", "env", "export", "--no-build"]
if from_history:
cmd.append("--from-history")
return cmd
Expand All @@ -70,7 +70,7 @@ def installed_packages(self) -> dict[str, set[str]]:
"""Return the installed packages"""
if self.installed is None:
LOGGER.info("Grabbing the list of installed packages ...")
self.installed = CondaPackageHelper._packages_from_json(
self.installed = CondaPackageHelper._parse_package_versions(
self._execute_command(
CondaPackageHelper._conda_export_command(from_history=False)
)
Expand All @@ -81,7 +81,7 @@ def requested_packages(self) -> dict[str, set[str]]:
"""Return the requested package (i.e. `mamba install <package>`)"""
if self.requested is None:
LOGGER.info("Grabbing the list of manually requested packages ...")
self.requested = CondaPackageHelper._packages_from_json(
self.requested = CondaPackageHelper._parse_package_versions(
self._execute_command(
CondaPackageHelper._conda_export_command(from_history=True)
)
Expand All @@ -94,12 +94,12 @@ def _execute_command(self, command: list[str]) -> str:
return rc.output.decode("utf-8") # type: ignore

@staticmethod
def _packages_from_json(env_export: str) -> dict[str, set[str]]:
def _parse_package_versions(env_export: str) -> dict[str, set[str]]:
"""Extract packages and versions from the lines returned by the list of specifications"""
# dependencies = filter(lambda x: isinstance(x, str), json.loads(env_export).get("dependencies"))
dependencies = json.loads(env_export).get("dependencies")
# Filtering packages installed through pip in this case it's a dict {'pip': ['toree==0.3.0']}
# Since we only manage packages installed through mamba here
dependencies = yaml.safe_load(env_export).get("dependencies")
# Filtering packages installed through pip
# since we only manage packages installed through mamba here
# They are represented by a dict with a key 'pip'
dependencies = filter(lambda x: isinstance(x, str), dependencies)
packages_dict: dict[str, set[str]] = dict()
for split in map(lambda x: re.split("=?=", x), dependencies):
Expand Down

0 comments on commit 3634797

Please sign in to comment.