From 84c82a0343fcb19ee107597749568bd8f2c696e1 Mon Sep 17 00:00:00 2001 From: Johnny Bouder Date: Thu, 19 Sep 2024 14:25:19 -0400 Subject: [PATCH 1/2] Update conda-lock to latest. Remove pydantic package pin. Fix pydantic path issue. --- conda_vendor/conda_vendor.py | 2 +- environment.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda_vendor/conda_vendor.py b/conda_vendor/conda_vendor.py index 10cbee7..55ae4af 100644 --- a/conda_vendor/conda_vendor.py +++ b/conda_vendor/conda_vendor.py @@ -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 diff --git a/environment.yaml b/environment.yaml index b0252bb..9ef80db 100644 --- a/environment.yaml +++ b/environment.yaml @@ -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 From 924ce3a11c9693ae169ca5c5e5b083b46554d098 Mon Sep 17 00:00:00 2001 From: Johnny Bouder Date: Thu, 19 Sep 2024 14:26:16 -0400 Subject: [PATCH 2/2] Replace deprecated module with supported version. --- conda_vendor/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda_vendor/__init__.py b/conda_vendor/__init__.py index c9754a7..8850b53 100644 --- a/conda_vendor/__init__.py +++ b/conda_vendor/__init__.py @@ -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"