Skip to content

Commit

Permalink
Merge pull request #49 from MetroStar/upgrades-2
Browse files Browse the repository at this point in the history
Conda Lock Upgrades - Part 2
  • Loading branch information
jbouder authored Sep 19, 2024
2 parents 1d58d5f + 924ce3a commit 8abee0d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions conda_vendor/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import pkg_resources
import importlib.metadata

from conda_vendor.conda_vendor import main

__all__ = ["main"]

try:
__version__ = pkg_resources.get_distribution("conda_vendor").version
__version__ = importlib.metadata.version("conda_vendor")
except Exception:
__version__ = "unknown"
2 changes: 1 addition & 1 deletion conda_vendor/conda_vendor.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def get_lock_spec_for_environment_file(environment_file, platform) -> LockSpecif
if isinstance(platform, str):
platform = [platform]

lock_spec = CondaLockWrapper.parse_environment_file(environment_file, platform)
lock_spec = CondaLockWrapper.parse_environment_file(Path(environment_file), platform)
return lock_spec


Expand Down
4 changes: 2 additions & 2 deletions environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ channels:
dependencies:
- python>=3.8
- click
- conda-lock=2.1.1
- conda-lock=2.5.7
- conda-build
- pip
- pydantic=1.10.17
- pydantic
- conda
- mamba
- micromamba
Expand Down

0 comments on commit 8abee0d

Please sign in to comment.