group options together in custom

Author: dschep

README.md

@@ -38,7 +38,8 @@ and the [docker-lambda](https://github.com/lambci/docker-lambda) image.
 To enable docker usage, add the following to your `serverless.yml`:
 ```yaml
 custom:
-  dockerizePip: true
+  pythonRequirements:
+    dockerizePip: true
 ```
 
 ## ZipImport!
@@ -48,7 +49,8 @@ and `scikit-learn`) there is support for having python import using
 add the following to your  `serverless.yml`:
 ```yaml
 custom:
-  zipImport: true
+  pythonRequirements:
+    zipImport: true
 ```
 
 

index.js

@@ -33,8 +33,7 @@ class ServerlessPythonRequirements {
         '-t', '.requirements',
         '-r', 'requirements.txt',
       ];
-      if (this.serverless.service.custom &&
-          this.serverless.service.custom.dockerizePip) {
+      if (this.custom.dockerizePip) {
         cmd = 'docker';
         options = [
           'run', '--rm',
@@ -56,7 +55,7 @@ class ServerlessPythonRequirements {
   packRequirements() {
     return this.installRequirements().then(() => {
       return new BbPromise((resolve, reject) => {
-        if (this.serverless.service.custom && this.serverless.service.custom.zipImport) {
+        if (this.custom.zipImport) {
           const zip = new Zip();
           zip.addLocalFolder('.requirements', '');
           zip.writeZip('.requirements.zip');
@@ -68,7 +67,7 @@ class ServerlessPythonRequirements {
 
   cleanup() {
     const artifacts = ['requirements.py'];
-    if (this.serverless.service.custom && this.serverless.service.custom.zipImport)
+    if (this.custom.zipImport)
       artifacts.push('.requirements.zip')
     else
       artifacts.push('.requirements')
@@ -94,6 +93,7 @@ class ServerlessPythonRequirements {
   constructor(serverless, options) {
     this.serverless = serverless;
     this.options = options;
+    this.custom = this.serverless.service.custom && this.serverless.service.custom.pythonRequirements || {};
 
     this.commands = {
       'requirements': {