Merge branch 'master' into master

Author: dschep

lib/poetry.js

@@ -35,9 +35,11 @@ function pyprojectTomlToRequirements() {
 
   const editableFlag = new RegExp(/^-e /gm);
   const sourceRequirements = path.join(this.servicePath, 'requirements.txt');
-  const requirementsContents = fse.readFileSync(sourceRequirements, {
-    encoding: 'utf-8'
-  });
+  const requirementsContents =
+    res.stdout.toString().trim() || // As of poetry 1.0.0b1, requirements.txt is printed to standard output when the -o option is not specified.
+    fse.readFileSync(sourceRequirements, {
+      encoding: 'utf-8'
+    });
 
   if (requirementsContents.match(editableFlag)) {
     this.serverless.cli.log(

test.js

@@ -52,6 +52,7 @@ const sls = mkCommand('sls');
 const git = mkCommand('git');
 const npm = mkCommand('npm');
 const perl = mkCommand('perl');
+const poetry = mkCommand('poetry');
 
 const setup = () => {
   removeSync(getUserCachePath());
@@ -1886,3 +1887,17 @@ test(
   },
   { skip: !canUseDocker() }
 );
+
+// From this point on, the version of the poetry is 1.0.0a0
+test('poetry1.0.0a0 py3.6 can package flask with default options', t => {
+  process.chdir('tests/poetry');
+  const path = npm(['pack', '../..']);
+  npm(['i', path]);
+  poetry(['self', 'update', '--preview', '1.0.0a0']);
+  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();
+});