Merge pull request #468 from maresb/remove-filelock-dep

conda · Jul 21, 2023 · 98accb9 · 98accb9
2 parents 5d9a1a2 + 34b95c4
commit 98accb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/environments/dev-environment.yaml b/environments/dev-environment.yaml
@@ -7,6 +7,7 @@ dependencies:
 - black
 - check-manifest
 - doctr
+- filelock
 - flake8
 - flake8-builtins
 - flake8-comprehensions

diff --git a/pyproject.toml b/pyproject.toml
@@ -26,18 +26,19 @@ classifiers = [
 dynamic = ["version"]
 license-files = { paths = ["LICENSE"] }
 dependencies = [
+    # conda-lock dependencies
     "click >=8.0",
     "click-default-group",
     "ensureconda >=1.3",
     "gitpython >=3.1.30",
     "jinja2",
     "pydantic >=1.10",
     "pyyaml >= 5.1",
-    "ruamel.yaml",
     'tomli; python_version<"3.11"',
     "typing-extensions",
+    # conda dependencies
+    "ruamel.yaml",
     "toolz >=0.12.0,<1.0.0",
-    "filelock >=3.8.0",
     # The following dependencies were added in the process of vendoring Poetry 1.1.15.
     # poetry:
     "cachecontrol[filecache] >=0.12.9",