Remove sys.path change requirement! closes #1

Author: dschep

README.md

@@ -5,7 +5,7 @@
 [![npm](https://nodei.co/npm/serverless-python-requirements.png?downloads=true&downloadRank=true)](https://www.npmjs.com/package/serverless-python-requirements)
 
 A Serverless v1.0 plugin to automatically bundle dependencies from 
-`requirements.txt`.
+`requirements.txt` and make them available in your `PYTHONPATH`.
 
 
 ## Install
@@ -24,6 +24,21 @@ plugins:
 
 ## Adding the dependencies to `sys.path`
 
+### Automatic
+The default behavior of this plugin is to link libraries into the working tree
+during deployment so that they are in your handler's `PYTHONPATH` when running
+on lambda.
+
+### Manual
+This method is required when using [ZipImport](#zipimport) support and can be
+enabled manually by adding the following option to your config:
+
+```yaml
+custom:
+  pythonRequirements:
+    link: false
+```
+
 `serverless-python-requirements` adds a module called `requirements` to your
 puck. To easily make the bundled dependencies available, simply import it. Eg.
 add this to the top of any file using dependencies specified in your

index.js

@@ -24,7 +24,7 @@ class ServerlessPythonRequirements {
       return BbPromise.resolve();
     }
 
-    this.serverless.cli.log('Packaging required Python packages...');
+    this.serverless.cli.log('Installing required Python packages...');
 
     return new BbPromise((resolve, reject) => {
       let cmd = 'pip';
@@ -56,6 +56,7 @@ class ServerlessPythonRequirements {
     return this.installRequirements().then(() => {
       return new BbPromise((resolve, reject) => {
         if (this.custom.zipImport) {
+          this.serverless.cli.log('Zipping required Python packages...');
           const zip = new Zip();
           zip.addLocalFolder('.requirements', '');
           zip.writeZip('.requirements.zip');
@@ -65,6 +66,21 @@ class ServerlessPythonRequirements {
     });
   }
 
+  linkRequirements() {
+    if (!this.custom.zipImport && this.custom.link) {
+      this.serverless.cli.log('Linking required Python packages...');
+      fse.readdirSync('.requirements').map(file =>
+        fse.symlinkSync(`.requirements/${file}`, `./${file}`));
+    }
+  }
+
+  unlinkRequirements() {
+    if (!this.custom.zipImport && this.custom.link) {
+      this.serverless.cli.log('Unlinking required Python packages...');
+      fse.readdirSync('.requirements').map(file => fse.unlinkSync(file));
+    }
+  }
+
   cleanup() {
     const artifacts = ['requirements.py'];
     if (this.custom.zipImport)
@@ -79,7 +95,11 @@ class ServerlessPythonRequirements {
   constructor(serverless, options) {
     this.serverless = serverless;
     this.options = options;
-    this.custom = this.serverless.service.custom && this.serverless.service.custom.pythonRequirements || {};
+    this.custom = Object.assign({
+      zipImport: false,
+      link: true,
+    }, this.serverless.service.custom &&
+    this.serverless.service.custom.pythonRequirements || {});
 
     this.commands = {
       'requirements': {
@@ -103,14 +123,19 @@ class ServerlessPythonRequirements {
     this.hooks = {
       'before:deploy:createDeploymentArtifacts': () => BbPromise.bind(this)
         .then(this.packVendorHelper)
-        .then(this.packRequirements),
+        .then(this.packRequirements)
+        .then(this.linkRequirements),
+
+      'after:deploy:createDeploymentArtifacts': () => BbPromise.bind(this)
+        .then(this.unlinkRequirements),
 
       'requirements:install:install': () => BbPromise.bind(this)
         .then(this.packVendorHelper)
         .then(this.packRequirements),
 
       'requirements:clean:clean': () => BbPromise.bind(this)
         .then(this.cleanup)
+        .then(this.unlinkRequirements),
     };
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-python-requirements",
-  "version": "1.2.0",
+  "version": "2.0.0-beta",
   "engines": {
     "node": ">=4.0"
   },