Merge branch 'master' into poetry-overwrite-requirements-file

Author: tpansino

README.md

@@ -239,7 +239,7 @@ custom:
 
 ## Extra Config Options
 ### Caching
-You can enable two kinds of caching with this plugin which are currently both DISABLED by default.  First, a download cache that will cache downloads that pip needs to compile the packages.  And second, a what we call "static caching" which caches output of pip after compiling everything for your requirements file.  Since generally requirements.txt files rarely change, you will often see large amounts of speed improvements when enabling the static cache feature.  These caches will be shared between all your projects if no custom cacheLocation is specified (see below).
+You can enable two kinds of caching with this plugin which are currently both ENABLED by default.  First, a download cache that will cache downloads that pip needs to compile the packages.  And second, a what we call "static caching" which caches output of pip after compiling everything for your requirements file.  Since generally requirements.txt files rarely change, you will often see large amounts of speed improvements when enabling the static cache feature.  These caches will be shared between all your projects if no custom cacheLocation is specified (see below).
 
  _**Please note:** This has replaced the previously recommended usage of "--cache-dir" in the pipCmdExtraArgs_
 ```yaml

lib/inject.js

@@ -62,11 +62,20 @@ function moveModuleUp(source, target, module) {
   return fse
     .readFileAsync(source)
     .then(buffer => JSZip.loadAsync(buffer))
-    .then(sourceZip => sourceZip.filter(file => file.startsWith(module + '/')))
+    .then(sourceZip =>
+      sourceZip.filter(
+        file =>
+          file.startsWith(module + '/') ||
+          file.startsWith('serverless_sdk/') ||
+          file.match(/s_.*\.py/) !== null
+      )
+    )
     .map(srcZipObj =>
       zipFile(
         targetZip,
-        srcZipObj.name.replace(module + '/', ''),
+        srcZipObj.name.startsWith(module + '/')
+          ? srcZipObj.name.replace(module + '/', '')
+          : srcZipObj.name,
         srcZipObj.async('nodebuffer')
       )
     )

lib/pip.js

@@ -123,9 +123,16 @@ function installRequirements(targetFolder, serverless, options) {
     options.pythonBin,
     '-m',
     'pip',
-    'install',
-    ...options.pipCmdExtraArgs
+    'install'
   ];
+  
+  if (Array.isArray(options.pipCmdExtraArgs) && options.pipCmdExtraArgs.length > 0) {
+    options.pipCmdExtraArgs.forEach(cmd => {
+      const parts = cmd.split(/\s+/, 2);
+      pipCmd.push(...parts);
+    });
+  }
+  
   const pipCmds = [pipCmd];
   const postCmds = [];
   // Check if we're using the legacy --cache-dir command...

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-python-requirements",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "engines": {
     "node": ">=6.0"
   },