Commit e82ec7dd by Sébastien Eustace

Fix installation of Poetry git dependencies with a build system

parent 62fc038d
# Change Log # Change Log
## [Unreleased]
### Fixed
- Fixed installation of Poetry git dependencies with a build system.
## [0.12.4] - 2018-10-21 ## [0.12.4] - 2018-10-21
### Fixed ### Fixed
......
...@@ -143,7 +143,7 @@ class PipInstaller(BaseInstaller): ...@@ -143,7 +143,7 @@ class PipInstaller(BaseInstaller):
return name return name
def install_directory(self, package, update=False): def install_directory(self, package):
from poetry.io import NullIO from poetry.io import NullIO
from poetry.masonry.builder import SdistBuilder from poetry.masonry.builder import SdistBuilder
from poetry.poetry import Poetry from poetry.poetry import Poetry
...@@ -161,12 +161,16 @@ class PipInstaller(BaseInstaller): ...@@ -161,12 +161,16 @@ class PipInstaller(BaseInstaller):
pyproject = TomlFile(os.path.join(req, "pyproject.toml")) pyproject = TomlFile(os.path.join(req, "pyproject.toml"))
has_poetry = False has_poetry = False
has_build_system = False
if pyproject.exists(): if pyproject.exists():
pyproject_content = pyproject.read() pyproject_content = pyproject.read()
has_poetry = ( has_poetry = (
"tool" in pyproject_content and "poetry" in pyproject_content["tool"] "tool" in pyproject_content and "poetry" in pyproject_content["tool"]
) )
has_build_system = "build-system" in pyproject_content # Even if there is a build system specified
# pip as of right now does not support it fully
# TODO: Check for pip version when proper PEP-517 support lands
# has_build_system = ("build-system" in pyproject_content)
setup = os.path.join(req, "setup.py") setup = os.path.join(req, "setup.py")
has_setup = os.path.exists(setup) has_setup = os.path.exists(setup)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment