Better defaults and some cleanup on Project.venv_bin

Author: agjohnson

readthedocs/doc_builder/backends/mkdocs.py

@@ -141,7 +141,7 @@ def build(self, **kwargs):
         cmd_ret = self.run(
             *build_command,
             cwd=checkout_path,
-            bin_path=self.project.venv_bin(version=self.version.slug, bin=None)
+            bin_path=self.project.venv_bin(version=self.version.slug)
         )
         return cmd_ret.successful
 

readthedocs/doc_builder/backends/sphinx.py

@@ -142,7 +142,7 @@ def build(self, **kwargs):
         cmd_ret = self.run(
             *build_command,
             cwd=project.conf_dir(self.version.slug),
-            bin_path=project.venv_bin(version=self.version.slug, bin=None)
+            bin_path=project.venv_bin(version=self.version.slug)
         )
         return cmd_ret.successful
 
@@ -244,7 +244,7 @@ def build(self, **kwargs):
             '.',
             '_build/latex',
             cwd=cwd,
-            bin_path=self.project.venv_bin(version=self.version.slug, bin=None)
+            bin_path=self.project.venv_bin(version=self.version.slug)
         )
         latex_cwd = os.path.join(cwd, '_build', 'latex')
         tex_files = glob(os.path.join(latex_cwd, '*.tex'))

readthedocs/projects/models.py

@@ -484,16 +484,17 @@ def single_version_symlink_path(self):
     # End symlink paths
     #
 
-    def venv_bin(self, version=LATEST, bin='python'):
+    def venv_bin(self, version=LATEST, bin=None):
         """Return path to the virtualenv bin path, or a specific binary
 
-        By default, return the path to the ``python`` binary in the virtual
-        environment path. If ``bin`` is :py:data:`None`, then return the path to
-        the virtual env path.
+        If ``bin`` is :py:data:`None`, then return the path to the virtual env
+        path, otherwise, return the path to the executable ``bin`` in the
+        virtual env ``bin`` path
         """
-        if bin is None:
-            bin = ''
-        return os.path.join(self.venv_path(version), 'bin', bin)
+        parts = [self.venv_path(version), 'bin']
+        if bin is not None:
+            parts.append(bin)
+        return os.path.join(*parts)
 
     def full_doc_path(self, version=LATEST):
         """

readthedocs/projects/tasks.py

@@ -283,7 +283,7 @@ def setup_environment(self):
         cmd.extend(requirements)
         self.build_env.run(
             *cmd,
-            bin_path=self.project.venv_bin(version=self.version.slug, bin=None)
+            bin_path=self.project.venv_bin(version=self.version.slug)
         )
 
         # Handle requirements
@@ -308,8 +308,7 @@ def setup_environment(self):
                 '--exists-action=w',
                 '-r{0}'.format(requirements_file_path),
                 cwd=checkout_path,
-                bin_path=self.project.venv_bin(version=self.version.slug,
-                                               bin=None)
+                bin_path=self.project.venv_bin(version=self.version.slug)
             )
 
         # Handle setup.py
@@ -324,8 +323,7 @@ def setup_environment(self):
                     '--ignore-installed',
                     '.',
                     cwd=checkout_path,
-                    bin_path=self.project.venv_bin(version=self.version.slug,
-                                                   bin=None)
+                    bin_path=self.project.venv_bin(version=self.version.slug)
                 )
             else:
                 self.build_env.run(
@@ -334,8 +332,7 @@ def setup_environment(self):
                     'install',
                     '--force',
                     cwd=checkout_path,
-                    bin_path=self.project.venv_bin(version=self.version.slug,
-                                                   bin=None)
+                    bin_path=self.project.venv_bin(version=self.version.slug)
                 )
 
     def build_docs(self):