Use implied version in all python env logic.

Author: ericholscher

readthedocs/doc_builder/python_environments.py

@@ -4,7 +4,6 @@
 
 from django.conf import settings
 
-from readthedocs.builds.constants import LATEST
 from readthedocs.doc_builder.config import ConfigWrapper
 from readthedocs.doc_builder.loader import get_builder_class
 from readthedocs.projects.constants import LOG_TEMPLATE
@@ -35,7 +34,7 @@ def delete_existing_build_dir(self):
 
         # Handle deleting old build dir
         build_dir = os.path.join(
-            self.venv_path(version=self.version.slug),
+            self.venv_path(),
             'build')
         if os.path.exists(build_dir):
             self._log('Removing existing build directory')
@@ -47,14 +46,14 @@ def install_package(self):
             if getattr(settings, 'USE_PIP_INSTALL', False):
                 self.build_env.run(
                     'python',
-                    self.venv_bin(version=self.version.slug, filename='pip'),
+                    self.venv_bin(filename='pip'),
                     'install',
                     '--ignore-installed',
                     '--cache-dir',
                     self.project.pip_cache_path,
                     '.',
                     cwd=self.checkout_path,
-                    bin_path=self.venv_bin(version=self.version.slug)
+                    bin_path=self.venv_bin()
                 )
             else:
                 self.build_env.run(
@@ -63,32 +62,31 @@ def install_package(self):
                     'install',
                     '--force',
                     cwd=self.checkout_path,
-                    bin_path=self.venv_bin(version=self.version.slug)
+                    bin_path=self.venv_bin()
                 )
 
-    def venv_bin(self, version=LATEST, filename=None):
+    def venv_bin(self, filename=None):
         """Return path to the virtualenv bin path, or a specific binary
 
-        :param version: Version slug to use in path name
         :param filename: If specified, add this filename to the path return
         :returns: Path to virtualenv bin or filename in virtualenv bin
         """
-        parts = [self.venv_path(version), 'bin']
+        parts = [self.venv_path(), 'bin']
         if filename is not None:
             parts.append(filename)
         return os.path.join(*parts)
 
 
 class Virtualenv(PythonEnvironment):
 
-    def venv_path(self, version=LATEST):
-        return os.path.join(self.project.doc_path, 'envs', version)
+    def venv_path(self):
+        return os.path.join(self.project.doc_path, 'envs', self.version.slug)
 
     def setup_base(self):
         site_packages = '--no-site-packages'
         if self.config.use_system_site_packages:
             site_packages = '--system-site-packages'
-        env_path = self.venv_path(version=self.version.slug)
+        env_path = self.venv_path()
         self.build_env.run(
             self.config.python_interpreter,
             '-mvirtualenv',
@@ -114,7 +112,7 @@ def install_core_requirements(self):
 
         cmd = [
             'python',
-            self.venv_bin(version=self.version.slug, filename='pip'),
+            self.venv_bin(filename='pip'),
             'install',
             '--use-wheel',
             '-U',
@@ -130,7 +128,7 @@ def install_core_requirements(self):
         cmd.extend(requirements)
         self.build_env.run(
             *cmd,
-            bin_path=self.venv_bin(version=self.version.slug)
+            bin_path=self.venv_bin()
         )
 
     def install_user_requirements(self):
@@ -149,21 +147,21 @@ def install_user_requirements(self):
         if requirements_file_path:
             self.build_env.run(
                 'python',
-                self.venv_bin(version=self.version.slug, filename='pip'),
+                self.venv_bin(filename='pip'),
                 'install',
                 '--exists-action=w',
                 '--cache-dir',
                 self.project.pip_cache_path,
                 '-r{0}'.format(requirements_file_path),
                 cwd=self.checkout_path,
-                bin_path=self.venv_bin(version=self.version.slug)
+                bin_path=self.venv_bin()
             )
 
 
 class Conda(PythonEnvironment):
 
-    def venv_path(self, version=LATEST):
-        return os.path.join(self.project.doc_path, 'conda', version)
+    def venv_path(self):
+        return os.path.join(self.project.doc_path, 'conda', self.version.slug)
 
     def setup_base(self):
         conda_env_path = os.path.join(self.project.doc_path, 'conda')
@@ -220,7 +218,7 @@ def install_core_requirements(self):
 
         pip_cmd = [
             'python',
-            self.venv_bin(version=self.version.slug, filename='pip'),
+            self.venv_bin(filename='pip'),
             'install',
             '-U',
             '--cache-dir',
@@ -229,7 +227,7 @@ def install_core_requirements(self):
         pip_cmd.extend(pip_requirements)
         self.build_env.run(
             *pip_cmd,
-            bin_path=self.venv_bin(version=self.version.slug)
+            bin_path=self.venv_bin()
         )
 
     def install_user_requirements(self):