Merge pull request #739 from conda/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate
conda · Nov 25, 2024 · 6efc47b · 6efc47b
2 parents b7e87a1 + 4f9e53b
commit 6efc47b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,14 +16,14 @@ repos:
     exclude: ^conda_lock/_vendor/conda/_vendor/appdirs\.py$
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.7.0
+  rev: v0.8.0
   hooks:
   - id: ruff
     args: [--fix, --exit-non-zero-on-fix]
   - id: ruff-format
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.12.1
+  rev: v1.13.0
   hooks:
   - id: mypy
     additional_dependencies:

diff --git a/conda_lock/interfaces/vendored_conda.py b/conda_lock/interfaces/vendored_conda.py
@@ -6,4 +6,4 @@
 from conda_lock._vendor.conda.models.match_spec import MatchSpec
 
 
-__all__ = ["toposort", "MatchSpec", "mask_anaconda_token", "split_anaconda_token"]
+__all__ = ["MatchSpec", "mask_anaconda_token", "split_anaconda_token", "toposort"]
diff --git a/conda_lock/interfaces/vendored_poetry.py b/conda_lock/interfaces/vendored_poetry.py
@@ -42,9 +42,9 @@
     "Link",
     "Operation",
     "PoetryDependency",
-    "PoetryPackage",
     "PoetryDirectoryDependency",
     "PoetryFileDependency",
+    "PoetryPackage",
     "PoetryProjectPackage",
     "PoetrySolver",
     "PoetryURLDependency",

diff --git a/conda_lock/lockfile/v2prelim/models.py b/conda_lock/lockfile/v2prelim/models.py
@@ -228,9 +228,9 @@ def __init__(
     "GitMeta",
     "HashModel",
     "InputMeta",
+    "LockMeta",
     "LockedDependency",
     "Lockfile",
-    "LockMeta",
     "MetadataOption",
     "TimeMeta",
     "UpdateSpecification",

diff --git a/conda_lock/virtual_package.py b/conda_lock/virtual_package.py
@@ -49,7 +49,7 @@ def to_repodata_entry(self) -> Tuple[str, Dict[str, Any]]:
 class FakeRepoData(BaseModel):
     base_path: pathlib.Path
     packages_by_subdir: DefaultDict[FakePackage, Set[str]] = Field(
-        default_factory=lambda: defaultdict(set)  # type: ignore[arg-type]
+        default_factory=lambda: defaultdict(set)  # type: ignore[arg-type,unused-ignore]
     )
     all_subdirs: Set[str] = {
         "noarch",

diff --git a/tests/test_conda_lock.py b/tests/test_conda_lock.py
@@ -1989,17 +1989,17 @@ def test_aggregate_lock_specs_invalid_pip_repos():
         sources=[],
     )
 
-    spec_a_b = base_spec.copy(update={"pip_repositories": [repo_a, repo_b]})
+    spec_a_b = base_spec.model_copy(update={"pip_repositories": [repo_a, repo_b]})
     agg_spec = aggregate_lock_specs([base_spec, spec_a_b, spec_a_b], platforms=[])
     assert agg_spec.pip_repositories == spec_a_b.pip_repositories
 
     # swap the order of the two repositories, which is an error
-    spec_b_a = base_spec.copy(update={"pip_repositories": [repo_b, repo_a]})
+    spec_b_a = base_spec.model_copy(update={"pip_repositories": [repo_b, repo_a]})
     with pytest.raises(ChannelAggregationError):
         agg_spec = aggregate_lock_specs([base_spec, spec_a_b, spec_b_a], platforms=[])
 
     # We can combine ["a"] with ["b", "a"], but not with ["a", "b"].
-    spec_a = base_spec.copy(update={"pip_repositories": [repo_a]})
+    spec_a = base_spec.model_copy(update={"pip_repositories": [repo_a]})
     aggregate_lock_specs([base_spec, spec_a, spec_b_a], platforms=[])
     with pytest.raises(ChannelAggregationError):
         aggregate_lock_specs([base_spec, spec_a, spec_a_b], platforms=[])