Better mixed runtime & function deploy handling

fixes #161 and fixes #179

Author: dschep

index.js

@@ -108,17 +108,28 @@ class ServerlessPythonRequirements {
       }
     };
 
-    const before = () =>
-      BbPromise.bind(this)
+    const before = () => {
+      if (arguments[1].functionObj && arguments[1].functionObj.runtime && !arguments[1].functionObj.runtime.startsWith('python'))
+        return;
+      return BbPromise.bind(this)
         .then(pipfileToRequirements)
         .then(addVendorHelper)
         .then(installAllRequirements)
         .then(packRequirements);
+    }
 
-    const after = () =>
-      BbPromise.bind(this)
+    const after = wat => {
+      if (arguments[1].functionObj && arguments[1].functionObj.runtime && !arguments[1].functionObj.runtime.startsWith('python'))
+        return;
+      return BbPromise.bind(this)
         .then(removeVendorHelper)
-        .then(injectAllRequirements);
+        .then(() =>
+          injectAllRequirements.bind(this)(
+            arguments[1].functionObj &&
+              arguments[1].functionObj.package.artifact
+          )
+        );
+    };
 
     const invalidateCaches = () => {
       if (this.options.invalidateCaches) {

lib/inject.js

@@ -72,7 +72,8 @@ function moveModuleUp(source, target, module) {
  * Inject requirements into packaged application.
  * @return {Promise} the combined promise for requirements injection.
  */
-function injectAllRequirements() {
+function injectAllRequirements(artifact) {
+  this.serverless.cli.log(artifact);
   this.serverless.cli.log('Injecting required Python packages to package...');
 
   if (this.options.zip) {
@@ -114,7 +115,7 @@ function injectAllRequirements() {
   } else {
     return injectRequirements(
       path.join('.serverless', 'requirements'),
-      this.serverless.service.package.artifact,
+      artifact || this.serverless.service.package.artifact,
       this.options
     );
   }

tests/base/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-4.0.0.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-4.0.2.tgz"
   }
 }