Merge branch 'master' into feature/github-actions

# Conflicts:
#	package.json
#	test.js

Author: bsamuel-ui

lib/pip.js

@@ -7,6 +7,7 @@ const { spawnSync } = require('child_process');
 const { quote } = require('shell-quote');
 const { buildImage, getBindPath, getDockerUid } = require('./docker');
 const { getStripCommand, getStripMode, deleteFiles } = require('./slim');
+const { isPoetryProject } = require('./poetry');
 const {
   checkForAndDeleteMaxCacheVersions,
   sha256Path,
@@ -62,7 +63,8 @@ function generateRequirementsFile(
 ) {
   if (
     options.usePoetry &&
-    fse.existsSync(path.join(servicePath, 'pyproject.toml'))
+    fse.existsSync(path.join(servicePath, 'pyproject.toml')) &&
+    isPoetryProject(servicePath)
   ) {
     filterRequirementsFile(
       path.join(servicePath, '.serverless/requirements.txt'),
@@ -442,7 +444,9 @@ function copyVendors(vendorFolder, targetFolder, serverless) {
 function requirementsFileExists(servicePath, options, fileName) {
   if (
     options.usePoetry &&
-    fse.existsSync(path.join(servicePath, 'pyproject.toml'))
+    fse.existsSync(
+      path.join(servicePath, 'pyproject.toml') && isPoetryProject(servicePath)
+    )
   ) {
     return true;
   }

lib/poetry.js

@@ -90,4 +90,4 @@ function isPoetryProject(servicePath) {
   return false;
 }
 
-module.exports = { pyprojectTomlToRequirements };
+module.exports = { pyprojectTomlToRequirements, isPoetryProject };

package.json

@@ -44,7 +44,7 @@
     "format": "prettier --write '{.,lib}/*.{js,md}'"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
+    "eslint": "^6.8.0",
     "prettier": "^1",
     "cross-spawn": "*",
     "tape": "*",

test.js

@@ -927,6 +927,20 @@ test(
   { skip: !hasPython(3.6) }
 );
 
+test(
+  'non poetry pyproject.toml without requirements.txt packages handler only',
+  async t => {
+    process.chdir('tests/non_poetry_pyproject');
+    const path = npm(['pack', '../..']);
+    npm(['i', path]);
+    sls(['package']);
+    const zipfiles = listZipFiles('.serverless/sls-py-req-test.zip');
+    t.true(zipfiles.includes(`handler.py`), 'handler is packaged');
+    t.end();
+  },
+  { skip: !hasPython(3.6) }
+);
+
 test(
   'poetry py3.6 can package flask with default options',
   async t => {

tests/non_poetry_pyproject/.gitignore

@@ -0,0 +1,22 @@
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Serverless
+.serverless
+.requirements
+unzip_requirements.py

tests/non_poetry_pyproject/handler.py

@@ -0,0 +1,5 @@
+import requests
+
+
+def hello(event, context):
+    return requests.get('https://httpbin.org/get').json()

tests/non_poetry_pyproject/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "example",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "serverless-python-requirements": "file:serverless-python-requirements-5.1.0.tgz"
+  }
+}

tests/non_poetry_pyproject/pyproject.toml

@@ -0,0 +1,10 @@
+[tool.black]
+line-length = 79
+py36 = true
+skip-string-normalization = true
+exclude = '''
+/(
+    \.serverless
+    | node_modules
+)/
+'''

tests/non_poetry_pyproject/serverless.yml

@@ -0,0 +1,18 @@
+service: sls-py-req-test
+
+provider:
+  name: aws
+  runtime: python3.6
+
+plugins:
+  - serverless-python-requirements
+
+package:
+  exclude:
+    - '**/*'
+  include:
+    - handler.py
+
+functions:
+  hello:
+    handler: handler.hello