Add support for .venv virtualenvs

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Added support for `git` dependencies in the `add` command.
 - Added support for `git` dependencies in the `add` command.
 - Added support for `file` dependencies in the `add` command.
 - Added support for `file` dependencies in the `add` command.
 - Added support for `src/` layout for packages.
 - Added support for `src/` layout for packages.
+- Added automatic detection of `.venv` virtualenvs.
 
 
 ### Changed
 ### Changed
 
 

poetry/console/commands/venv_command.py

@@ -13,7 +13,10 @@ class VenvCommand(Command):
 
 
         super(VenvCommand, self).initialize(i, o)
         super(VenvCommand, self).initialize(i, o)
 
 
-        self._venv = Venv.create(o, self.poetry.package.name)
+        self._venv = Venv.create(
+            o, self.poetry.package.name,
+            cwd=self.poetry.file.parent
+        )
 
 
         if self._venv.is_venv() and o.is_verbose():
         if self._venv.is_venv() and o.is_verbose():
             o.writeln(
             o.writeln(

poetry/utils/venv.py

@@ -47,52 +47,58 @@ class Venv(object):
         self._python_implementation = None
         self._python_implementation = None
 
 
     @classmethod
     @classmethod
-    def create(cls, io, name=None):  # type: (...) -> Venv
+    def create(cls, io, name=None, cwd=None):  # type: (...) -> Venv
         if 'VIRTUAL_ENV' not in os.environ:
         if 'VIRTUAL_ENV' not in os.environ:
             # Not in a virtualenv
             # Not in a virtualenv
             # Checking if we need to create one
             # Checking if we need to create one
-            config = Config.create('config.toml')
 
 
-            create_venv = config.setting('settings.virtualenvs.create')
-
-            venv_path = config.setting('settings.virtualenvs.path')
-            if venv_path is None:
-                venv_path = Path(CACHE_DIR) / 'virtualenvs'
+            # First we check if there is a .venv
+            # at the root of the project.
+            if cwd and (cwd / '.venv').exists():
+                venv = cwd / '.venv'
             else:
             else:
-                venv_path = Path(venv_path)
+                config = Config.create('config.toml')
 
 
-            if not name:
-                name = Path.cwd().name
+                create_venv = config.setting('settings.virtualenvs.create')
 
 
-            name = '{}-py{}'.format(
-                name, '.'.join([str(v) for v in sys.version_info[:2]])
-            )
+                venv_path = config.setting('settings.virtualenvs.path')
+                if venv_path is None:
+                    venv_path = Path(CACHE_DIR) / 'virtualenvs'
+                else:
+                    venv_path = Path(venv_path)
 
 
-            venv = venv_path / name
-            if not venv.exists():
-                if create_venv is False:
-                    io.writeln(
-                        '<fg=black;bg=yellow>'
-                        'Skipping virtualenv creation, '
-                        'as specified in config file.'
-                        '</>'
-                    )
+                if not name:
+                    name = Path.cwd().name
 
 
-                    return cls()
-
-                io.writeln(
-                    'Creating virtualenv <info>{}</> in {}'.format(
-                        name, str(venv_path)
-                    )
+                name = '{}-py{}'.format(
+                    name, '.'.join([str(v) for v in sys.version_info[:2]])
                 )
                 )
 
 
-                cls.build(str(venv))
-            else:
-                if io.is_very_verbose():
+                venv = venv_path / name
+                if not venv.exists():
+                    if create_venv is False:
+                        io.writeln(
+                            '<fg=black;bg=yellow>'
+                            'Skipping virtualenv creation, '
+                            'as specified in config file.'
+                            '</>'
+                        )
+
+                        return cls()
+
                     io.writeln(
                     io.writeln(
-                        'Virtualenv <info>{}</> already exists.'.format(name)
+                        'Creating virtualenv <info>{}</> in {}'.format(
+                            name, str(venv_path)
+                        )
                     )
                     )
 
 
+                    cls.build(str(venv))
+                else:
+                    if io.is_very_verbose():
+                        io.writeln(
+                            'Virtualenv <info>{}</> already exists.'.format(name)
+                        )
+
             os.environ['VIRTUAL_ENV'] = str(venv)
             os.environ['VIRTUAL_ENV'] = str(venv)
 
 
         # venv detection:
         # venv detection: