Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conda Lock Upgrades - Part 2 #49

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Conda Lock Upgrades - Part 2 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84c82a0
Update conda-lock to latest. Remove pydantic package pin. Fix pydanti…
jbouder Sep 19, 2024
924ce3a
Replace deprecated module with supported version.
jbouder Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conda_vendor/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import pkg_resources
import importlib.metadata

jbouder marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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)
jbouder marked this conversation as resolved.
Show resolved Hide resolved
return lock_spec


Expand Down
4 changes: 2 additions & 2 deletions environment.yaml
View file
Open in desktop
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
Loading