Fix poetry with git dependencies (serverless#390)

Fix poetry with git dependencies

Author: dschep

README.md

@@ -110,6 +110,26 @@ custom:
     usePoetry: false
 ```
 
+### Poetry with git dependencies
+Poetry by default generates the exported requirements.txt file with `-e` and that breaks pip with `-t` parameter
+(used to install all requirements in a specific folder). In order to fix that we remove all `-e ` from the generated file but,
+for that to work you need to add the git dependencies in a specific way.
+
+Instead of:
+```toml
+[tool.poetry.dependencies]
+bottle = {git = "[email protected]/bottlepy/bottle.git", tag = "0.12.16"}
+```
+Use:
+```toml
+[tool.poetry.dependencies]
+bottle = {git = "https://[email protected]/bottlepy/bottle.git", tag = "0.12.16"}
+```
+Or, if you have an SSH key configured:
+```toml
+[tool.poetry.dependencies]
+bottle = {git = "ssh://[email protected]/bottlepy/bottle.git", tag = "0.12.16"}
+```
 
 ## Dealing with Lambda's size limitations
 To help deal with potentially large dependencies (for example: `numpy`, `scipy`

lib/pip.js

@@ -317,7 +317,7 @@ function installRequirements(targetFolder, serverless, options) {
       throw res.error;
     }
     if (res.status !== 0) {
-      throw new Error(res.stderr);
+      throw new Error(`STDOUT: ${res.stdout}\n\nSTDERR: ${res.stderr}`);
     }
   });
   // If enabled slimming, delete files in slimPatterns

lib/poetry.js

@@ -32,9 +32,26 @@ function pyprojectTomlToRequirements() {
   if (res.status !== 0) {
     throw new Error(res.stderr);
   }
+
+  const editableFlag = new RegExp(/^-e /gm);
+  const sourceRequirements = path.join(this.servicePath, 'requirements.txt');
+  const requirementsContents = fse.readFileSync(sourceRequirements, {
+    encoding: 'utf-8'
+  });
+
+  if (requirementsContents.match(editableFlag)) {
+    this.serverless.cli.log(
+      'The generated file contains -e lines, removing them...'
+    );
+    fse.writeFileSync(
+      sourceRequirements,
+      requirementsContents.replace(editableFlag, '')
+    );
+  }
+
   fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
   fse.moveSync(
-    path.join(this.servicePath, 'requirements.txt'),
+    sourceRequirements,
     path.join(this.servicePath, '.serverless', 'requirements.txt')
   );
 }

test.js

@@ -727,6 +727,7 @@ test('poetry py3.6 can package flask with default options', t => {
   sls(['package']);
   const zipfiles = listZipFiles('.serverless/sls-py-req-test.zip');
   t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
+  t.true(zipfiles.includes(`bottle.py`), 'bottle is packaged');
   t.true(zipfiles.includes(`boto3${sep}__init__.py`), 'boto3 is packaged');
   t.end();
 });

tests/poetry/poetry.lock

@@ -7,7 +7,7 @@ authors = ["Your Name <[email protected]>"]
 [tool.poetry.dependencies]
 python = "^3.6"
 Flask = "^1.0"
-bottle = "^0.12.16"
+bottle = {git = "https://[email protected]/bottlepy/bottle.git", tag = "0.12.16"}
 boto3 = "^1.9"
 
 [tool.poetry.dev-dependencies]