From 9506b9f298dafc4f598a659d76e3e01a6078180e Mon Sep 17 00:00:00 2001
From: Santos Gallegos <santos_g@outlook.com>
Date: Thu, 21 Feb 2019 20:13:59 -0500
Subject: [PATCH] Require conda.file when using conda in v1

Some people are migrating from pip to conda,
but they were using a v1 config,
then when migrating they are using the conda option from v2.

We are not validating this, but using conda.file is mandatory
when using the conda option (or rtd will fail without any reason).

Close #5322
Close #5228
---
 readthedocs/config/config.py            | 17 ++++++++---------
 readthedocs/config/tests/test_config.py | 12 ++++++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/readthedocs/config/config.py b/readthedocs/config/config.py
index b8ec896d8..9b7c1a0c7 100644
--- a/readthedocs/config/config.py
+++ b/readthedocs/config/config.py
@@ -489,15 +489,14 @@ class BuildConfigV1(BuildConfigBase):
             raw_conda = self.raw_config['conda']
             with self.catch_validation_error('conda'):
                 validate_dict(raw_conda)
-            conda_environment = None
-            if 'file' in raw_conda:
-                with self.catch_validation_error('conda.file'):
-                    conda_environment = validate_file(
-                        raw_conda['file'],
-                        self.base_path,
-                    )
-            conda['environment'] = conda_environment
-
+            with self.catch_validation_error('conda.file'):
+                if 'file' not in raw_conda:
+                    raise ValidationError('file', VALUE_NOT_FOUND)
+                conda_environment = validate_file(
+                    raw_conda['file'],
+                    self.base_path,
+                )
+                conda['environment'] = conda_environment
             return conda
         return None
 
diff --git a/readthedocs/config/tests/test_config.py b/readthedocs/config/tests/test_config.py
index a97ebe637..32d4b1673 100644
--- a/readthedocs/config/tests/test_config.py
+++ b/readthedocs/config/tests/test_config.py
@@ -582,6 +582,18 @@ def test_validates_conda_file(tmpdir):
     assert build.conda.environment == str(tmpdir.join('environment.yml'))
 
 
+def test_file_is_required_when_using_conda(tmpdir):
+    apply_fs(tmpdir, {'environment.yml': ''})
+    build = get_build_config(
+        {'conda': {'foo': 'environment.yml'}},
+        source_file=str(tmpdir.join('readthedocs.yml')),
+    )
+    with raises(InvalidConfig) as excinfo:
+        build.validate()
+    assert excinfo.value.key == 'conda.file'
+    assert excinfo.value.code == VALUE_NOT_FOUND
+
+
 def test_requirements_file_empty():
     build = get_build_config({})
     build.validate()