Merge branch 'master' into fix--invalid-highlight-search

dojutsu-user · web-flow · commit c0a5fd9b22b7 · 2019-07-17T23:50:49.000+05:30
diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py
@@ -420,6 +420,7 @@ def _update_conda_startup(self):
             '--name=base',
             '--channel=defaults',
             'conda',
+            cwd=self.checkout_path,
         )
 
     def setup_base(self):
diff --git a/readthedocs/projects/tasks.py b/readthedocs/projects/tasks.py
@@ -649,6 +649,7 @@ def get_env_vars(self):
             'READTHEDOCS': True,
             'READTHEDOCS_VERSION': self.version.slug,
             'READTHEDOCS_PROJECT': self.project.slug,
+            'READTHEDOCS_LANGUAGE': self.project.language,
         }
 
         if self.config.conda is not None:
diff --git a/readthedocs/rtd_tests/tests/test_builds.py b/readthedocs/rtd_tests/tests/test_builds.py
@@ -341,6 +341,7 @@ def test_get_env_vars(self):
             'READTHEDOCS': True,
             'READTHEDOCS_VERSION': version.slug,
             'READTHEDOCS_PROJECT': project.slug,
+            'READTHEDOCS_LANGUAGE': project.language,
             'BIN_PATH': os.path.join(
                 project.doc_path,
                 'envs',

Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,7 @@ def _update_conda_startup(self):`
`420`	`420`	`'--name=base',`
`421`	`421`	`'--channel=defaults',`
`422`	`422`	`'conda',`
	`423`	`+ cwd=self.checkout_path,`
`423`	`424`	`)`
`424`	`425`
`425`	`426`	`def setup_base(self):`
Original file line number	Diff line number	Diff line change
`@@ -649,6 +649,7 @@ def get_env_vars(self):`
`649`	`649`	`'READTHEDOCS': True,`
`650`	`650`	`'READTHEDOCS_VERSION': self.version.slug,`
`651`	`651`	`'READTHEDOCS_PROJECT': self.project.slug,`
	`652`	`+ 'READTHEDOCS_LANGUAGE': self.project.language,`
`652`	`653`	`}`
`653`	`654`
`654`	`655`	`if self.config.conda is not None:`