support git subfolder

poetry/core/json/schemas/poetry-schema.json

@@ -296,6 +296,10 @@
                     "type": "string",
                     "description": "The revision to checkout."
                 },
+                "subdirectory": {
+                    "type": "string",
+                    "description": "path relative to repositories root, where package is located"
+                },
                 "python": {
                     "type": "string",
                     "description": "The python versions for which the dependency should be installed."

poetry/core/packages/package.py

@@ -64,6 +64,7 @@ def __init__(self, name, version, pretty_version=None):
         self.source_type = ""
         self.source_reference = ""
         self.source_url = ""
+        self.source_subdirectory = ""
 
         self.requires = []
         self.dev_requires = []
@@ -299,6 +300,7 @@ def add_dependency(
                     rev=constraint.get("rev", None),
                     category=category,
                     optional=optional,
+                    subdirectory=constraint.get("subdirectory", None),
                 )
             elif "file" in constraint:
                 file_path = Path(constraint["file"])

poetry/core/packages/vcs_dependency.py

@@ -16,8 +16,9 @@ def __init__(
         branch=None,
         tag=None,
         rev=None,
-        category="main",
         optional=False,
+        category="main",
+        subdirectory=None,
     ):
         self._vcs = vcs
         self._source = source
@@ -29,6 +30,7 @@ def __init__(
         self._branch = branch
         self._tag = tag
         self._rev = rev
+        self._subdirectory = subdirectory
 
         super(VCSDependency, self).__init__(
             name, "*", category=category, optional=optional, allows_prereleases=True
@@ -54,6 +56,10 @@ def tag(self):
     def rev(self):
         return self._rev
 
+    @property
+    def subdirectory(self):
+        return self._subdirectory
+
     @property
     def reference(self):  # type: () -> str
         return self._branch or self._tag or self._rev
@@ -87,6 +93,9 @@ def base_pep_508_name(self):  # type: () -> str
                 self._vcs, parsed_url.format(), self.reference
             )
 
+        if self.subdirectory:
+            requirement += "#subdirectory={}".format(self.subdirectory)
+
         return requirement
 
     def is_vcs(self):  # type: () -> bool

poetry/core/vcs/git.py

@@ -14,7 +14,8 @@
     "port": r"\d+",
     "path": r"[\w~.\-/\\]+",
     "name": r"[\w~.\-]+",
-    "rev": r"[^@#]+",
+    "rev": r"[^@#?]+",
+    "subdir": r"[\w\-/\\]+",
 }
 
 PATTERNS = [
@@ -27,13 +28,15 @@
         r"(?P<pathname>[:/\\]({path}[/\\])?"
         r"((?P<name>{name}?)(\.git|[/\\])?)?)"
         r"([@#](?P<rev>{rev}))?"
+        r"(\?subdirectory=(?P<subdirectory>{subdir}))?"
         r"$".format(
             user=pattern_formats["user"],
             resource=pattern_formats["resource"],
             port=pattern_formats["port"],
             path=pattern_formats["path"],
             name=pattern_formats["name"],
             rev=pattern_formats["rev"],
+            subdir=pattern_formats["subdir"],
         )
     ),
     re.compile(
@@ -45,6 +48,7 @@
         r"(?P<pathname>({path})"
         r"(?P<name>{name})(\.git|/)?)"
         r"([@#](?P<rev>{rev}))?"
+        r"(\?subdirectory=(?P<subdirectory>{subdir}))?"
         r"$".format(
             protocol=pattern_formats["protocol"],
             user=pattern_formats["user"],
@@ -53,6 +57,7 @@
             path=pattern_formats["path"],
             name=pattern_formats["name"],
             rev=pattern_formats["rev"],
+            subdir=pattern_formats["subdir"],
         )
     ),
     re.compile(
@@ -62,13 +67,15 @@
         r"(?P<pathname>([:/]{path}/)"
         r"(?P<name>{name})(\.git|/)?)"
         r"([@#](?P<rev>{rev}))?"
+        r"(\?subdirectory=(?P<subdirectory>{subdir}))?"
         r"$".format(
             user=pattern_formats["user"],
             resource=pattern_formats["resource"],
             port=pattern_formats["port"],
             path=pattern_formats["path"],
             name=pattern_formats["name"],
             rev=pattern_formats["rev"],
+            subdir=pattern_formats["subdir"],
         )
     ),
     re.compile(
@@ -78,26 +85,31 @@
         r"(?P<pathname>({path})"
         r"(?P<name>{name})(\.git|/)?)"
         r"([@#](?P<rev>{rev}))?"
+        r"(\?subdirectory=(?P<subdirectory>{subdir}))?"
         r"$".format(
             user=pattern_formats["user"],
             resource=pattern_formats["resource"],
             path=pattern_formats["path"],
             name=pattern_formats["name"],
             rev=pattern_formats["rev"],
+            subdir=pattern_formats["subdir"],
         )
     ),
 ]
 
 
 class ParsedUrl:
-    def __init__(self, protocol, resource, pathname, user, port, name, rev):
+    def __init__(
+        self, protocol, resource, pathname, user, port, name, rev, subdirectory
+    ):
         self.protocol = protocol
         self.resource = resource
         self.pathname = pathname
         self.user = user
         self.port = port
         self.name = name
         self.rev = rev
+        self.subdirectory = subdirectory
 
     @classmethod
     def parse(cls, url):  # type: () -> ParsedUrl
@@ -113,6 +125,7 @@ def parse(cls, url):  # type: () -> ParsedUrl
                     groups.get("port"),
                     groups.get("name"),
                     groups.get("rev"),
+                    groups.get("subdirectory"),
                 )
 
         raise ValueError('Invalid git url "{}"'.format(url))
@@ -128,13 +141,17 @@ def url(self):  # type: () -> str
         )
 
     def format(self):
-        return "{}".format(self.url, "#{}".format(self.rev) if self.rev else "",)
+        return "{}".format(
+            self.url,
+            "#{}".format(self.rev) if self.rev else "",
+            "?subdirectory={}".format(self.subdirectory) if self.subdirectory else "",
+        )
 
     def __str__(self):  # type: () -> str
         return self.format()
 
 
-GitUrl = namedtuple("GitUrl", ["url", "revision"])
+GitUrl = namedtuple("GitUrl", ["url", "revision", "subdirectory"])
 
 
 class GitConfig:
@@ -174,7 +191,11 @@ def normalize_url(cls, url):  # type: (str) -> GitUrl
 
         formatted = re.sub(r"^git\+", "", url)
         if parsed.rev:
-            formatted = re.sub(r"[#@]{}$".format(parsed.rev), "", formatted)
+            formatted = re.sub(r"[#@]{}(\?.*)?$".format(parsed.rev), "", formatted)
+        if parsed.subdirectory:
+            formatted = re.sub(
+                r"\?subdirectory={}$".format(parsed.subdirectory), "", formatted
+            )
 
         altered = parsed.format() != formatted
 
@@ -186,11 +207,13 @@ def normalize_url(cls, url):  # type: (str) -> GitUrl
             elif re.match(r"^git\+file", url):
                 normalized = re.sub(r"git\+", "", url)
             else:
-                normalized = re.sub(r"^(?:git\+)?ssh://", "", url)
+                normalized = re.sub(r"^(?:git\+)?ssh://", "", formatted)
         else:
             normalized = parsed.format()
 
-        return GitUrl(re.sub(r"#[^#]*$", "", normalized), parsed.rev)
+        return GitUrl(
+            re.sub(r"#[^#]*$", "", normalized), parsed.rev, parsed.subdirectory
+        )
 
     @property
     def config(self):  # type: () -> GitConfig
@@ -229,6 +252,8 @@ def rev_parse(self, rev, folder=None):  # type: (...) -> str
                 folder.as_posix(),
             ]
 
+        # We need "^{commit}" to ensure that the commit SHA of the commit the
+        # tag points to is returned, even in the case of annotated tags.
         args += ["rev-parse", rev + "^{commit}"]
 
         return self.run(*args)

tests/packages/test_package.py

@@ -4,6 +4,7 @@
 import pytest
 
 from poetry.core.packages import Package
+from poetry.core.packages import VCSDependency
 
 
 def test_package_authors():
@@ -37,3 +38,18 @@ def test_package_add_dependency_vcs_category_default_main():
         "poetry", constraint={"git": "https://github.com/python-poetry/poetry.git"}
     )
     assert dependency.category == "main"
+
+
+def test_package_add_dependency_vcs__with_subdirectory():
+    package = Package("foo", "0.1.0")
+
+    dependency = package.add_dependency(
+        "poetry",
+        constraint={
+            "git": "https://github.com/demo/project_in_subdirectory.git",
+            "subdirectory": "mypackage",
+        },
+    )
+    assert dependency.source == "https://github.com/demo/project_in_subdirectory.git"
+    assert dependency.subdirectory == "mypackage"
+    assert isinstance(dependency, VCSDependency)

tests/packages/test_vcs_dependency.py

@@ -61,6 +61,19 @@ def test_to_pep_508_in_extras():
     assert expected == dependency.to_pep_508()
 
 
+def test_to_pep_508_with_subdirectory():
+    dependency = VCSDependency(
+        "poetry",
+        "git",
+        "https://github.com/python-poetry/poetry.git",
+        subdirectory="mypackage",
+    )
+
+    expected = "poetry @ git+https://github.com/python-poetry/poetry.git@master#subdirectory=mypackage"
+
+    assert expected == dependency.to_pep_508()
+
+
 @pytest.mark.parametrize("category", ["main", "dev"])
 def test_category(category):
     dependency = VCSDependency(