Skip to content

Commit

Permalink
Merge pull request #597 from jfrost-mo/main
Browse files Browse the repository at this point in the history
Increase minimum ensureconda version for py3.12 compatibility
  • Loading branch information
maresb authored Feb 5, 2024
2 parents 2c2999b + b86ec43 commit 431c09b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions conda_lock/invoke_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import tempfile
import threading

from distutils.version import LooseVersion
from typing import IO, Dict, Iterator, List, Optional, Sequence, Union

from ensureconda.api import determine_micromamba_version, ensureconda
from packaging.version import Version

from conda_lock.models.channel import Channel

Expand Down Expand Up @@ -57,7 +57,7 @@ def determine_conda_executable(
for candidate in _determine_conda_executable(conda_executable, mamba, micromamba):
if candidate is not None:
if is_micromamba(candidate):
if determine_micromamba_version(str(candidate)) < LooseVersion("0.17"):
if determine_micromamba_version(str(candidate)) < Version("0.17"):
mamba_root_prefix()
return candidate
raise RuntimeError("Could not find conda (or compatible) executable")
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
# conda-lock dependencies
"click >=8.0",
"click-default-group",
"ensureconda >=1.3",
"ensureconda >=1.4.4",
"gitpython >=3.1.30",
"jinja2",
"pydantic >=1.10",
Expand Down

0 comments on commit 431c09b

Please sign in to comment.