Register activators as entry_points

Author: Siddhant Kumar

setup.cfg

@@ -77,6 +77,13 @@ virtualenv.seed =
     pip = virtualenv.seed.embed.pip_invoke:PipInvoke
     link-app-data = virtualenv.seed.embed.link_app_data:LinkFromAppData
 virtualenv.activate =
+    bash = virtualenv.activation.bash:BashActivator
+    cshell = virtualenv.activation.cshell:CShellActivator
+    dos = virtualenv.activation.dos:DOSActivator
+    fish = virtualenv.activation.fish:FishActivator
+    power-shell = virtualenv.activation.powershell:PowerShellActivator
+    python = virtualenv.activation.python:PythonActivator
+    xonosh = virtualenv.activation.xonosh:XonoshActivator
 [sdist]
 formats = gztar
 

src/virtualenv/activation/activator.py

@@ -17,11 +17,12 @@ def add_parser_arguments(cls, parser):
         pass
 
     def run(self, creator):
-        self.generate()
+        self.generate(creator)
         if self.flag_prompt is not None:
             creator.pyenv_cfg["prompt"] = self.flag_prompt
 
-    def supports(self, interpreter):
+    @classmethod
+    def supports(cls, interpreter):
         return True
 
     def mappings(self, creator):
@@ -34,10 +35,10 @@ def mappings(self, creator):
             "__PATH_SEP__": os.pathsep,
         }
 
-    def generate(self, dest, creator):
+    def generate(self, creator):
         mappings = self.mappings(creator)
         for resource in map(str, self.files):
             text = pkgutil.get_data(self.__module__, resource).decode("utf-8")
             for start, end in mappings.items():
                 text = text.replace(start, end)
-            (dest / resource).write_text(text)
+            (creator.bin_dir / resource).write_text(text)

src/virtualenv/activation/dos/__init__.py

@@ -9,7 +9,8 @@ class DOSActivator(Activator):
 
     files = [Path("activate.bat"), Path("deactivate.bat")]
 
-    def supports(self, interpreter):
+    @classmethod
+    def supports(cls, interpreter):
         if interpreter.os == "nt":
             return True
         return False

src/virtualenv/activation/utils.py

@@ -1,5 +1,6 @@
 class RequiresPosixMixin(object):
-    def supports(self, interpreter):
+    @classmethod
+    def supports(cls, interpreter):
         if interpreter.os != "nt":
             return True
         return False

src/virtualenv/activation/xonosh/__init__.py

@@ -9,5 +9,6 @@ class XonoshActivator(Activator):
 
     files = [Path("activate.xsh")]
 
-    def supports(self, interpreter):
+    @classmethod
+    def supports(cls, interpreter):
         return True if interpreter.version_info >= (3, 4) else False

src/virtualenv/interpreters/create/creator.py

@@ -10,15 +10,6 @@
 from pathlib2 import Path
 from six import add_metaclass
 
-from virtualenv.activation import (
-    BashActivator,
-    CShellActivator,
-    DOSActivator,
-    FishActivator,
-    PowerShellActivator,
-    PythonActivator,
-    XonoshActivator,
-)
 from virtualenv.info import IS_WIN
 from virtualenv.pyenv_cfg import PyEnvCfg
 from virtualenv.util import run_cmd
@@ -37,18 +28,6 @@ def __init__(self, options, interpreter):
         self.system_site_package = options.system_site
         self.clear = options.clear
         self.pyenv_cfg = PyEnvCfg.from_folder(self.dest_dir)
-        self.activations = []
-        for activation in [
-            BashActivator(options),
-            PowerShellActivator(options),
-            XonoshActivator(options),
-            CShellActivator(options),
-            PythonActivator(options),
-            DOSActivator(options),
-            FishActivator(options),
-        ]:
-            if activation.supports(self.interpreter):
-                self.activations.append(activation)
 
     @classmethod
     def add_parser_arguments(cls, parser):
@@ -105,8 +84,6 @@ def run(self):
         if self.dest_dir.exists() and self.clear:
             shutil.rmtree(str(self.dest_dir), ignore_errors=True)
         self.create()
-        for activation in self.activations:
-            activation.generate(self.bin_dir, self)
         self.set_pyenv_cfg()
 
     @abstractmethod

test/unit/activation/conftest.py

@@ -1,8 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
-import pytest
 import os
 
+import pytest
+
 from virtualenv.run import run_via_cli