Merge branch 'condagh-12942' of https://github.com/swaldhoer/conda into

condagh-12942
swaldhoer · Mar 29, 2024 · 36a9581 · 36a9581
2 parents 481eb0f + 75a893d
commit 36a9581
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/conda/env/env.py b/conda/env/env.py
@@ -188,7 +188,7 @@ def from_file(filename):
                 yamlstr = yamlb.decode("utf-16")
         return from_yaml(yamlstr, filename=filename)
     elif filename.endswith("json"):
-        with open(filename, "r", encoding="utf-8") as fp:
+        with open(filename, encoding="utf-8") as fp:
             envstr = fp.read()
         return from_json(envstr, filename=filename)
 

diff --git a/conda/env/specs/__init__.py b/conda/env/specs/__init__.py
@@ -12,8 +12,8 @@
 )
 from ...gateways.connection.session import CONDA_SESSION_SCHEMES
 from .binstar import BinstarSpec
-from .requirements import RequirementsSpec
 from .env_file import EnvironmentFileSpec
+from .requirements import RequirementsSpec
 
 FileSpecTypes = Union[Type[EnvironmentFileSpec], Type[RequirementsSpec]]
 

diff --git a/news/12942-create-env-from-json b/news/12942-create-env-from-json
@@ -0,0 +1,19 @@
+### Enhancements
+
+* Add support for `conda env create -f environment.json`. (#12942)
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* Document support for `conda env create -f environment.json`. (#12942)
+
+### Other
+
+* <news item>