Merge branch 'master' into master

Author: bsamuel-ui

README.md

@@ -21,7 +21,7 @@ This will automatically add the plugin to your project's `package.json` and the
 `serverless.yml`. That's all that's needed for basic use! The plugin will now bundle your python
 dependencies specified in your `requirements.txt` or `Pipfile` when you run `sls deploy`.
 
-For a more in depth introduction on how to user this plugin, check out 
+For a more in depth introduction on how to user this plugin, check out
 [this post on the Serverless Blog](https://serverless.com/blog/serverless-python-packaging/)
 
 If you're on a mac, check out [these notes](#applebeersnake-mac-brew-installed-python-notes) about using python installed by brew.
@@ -113,17 +113,17 @@ except ImportError:
   pass
 ```
 ### Slim Package
-_Works on non 'win32' environments: Docker, WSL are included_  
-To remove the tests, information and caches from the installed packages, 
-enable the `slim` option. This will: `strip` the `.so` files, remove `__pycache__` 
-and `dist-info` directories as well as `.pyc` and `.pyo` files.  
+_Works on non 'win32' environments: Docker, WSL are included_
+To remove the tests, information and caches from the installed packages,
+enable the `slim` option. This will: `strip` the `.so` files, remove `__pycache__`
+and `dist-info` directories as well as `.pyc` and `.pyo` files.
 ```yaml
 custom:
   pythonRequirements:
     slim: true
-```  
-#### Custom Removal Patterns  
-To specify additional directories to remove from the installed packages, 
+```
+#### Custom Removal Patterns
+To specify additional directories to remove from the installed packages,
 define a list of patterns in the serverless config using the `slimPatterns`
 option and glob syntax. These paterns will be added to the default ones (`**/*.py[c|o]`, `**/__pycache__*`, `**/*.dist-info*`).
 Note, the glob syntax matches against whole paths, so to match a file in any
@@ -134,7 +134,7 @@ custom:
     slim: true
     slimPatterns:
       - "**/*.egg-info*"
-```  
+```
 To overwrite the default patterns set the option `slimPatternsAppendDefaults` to `false` (`true` by default).
 ```yaml
 custom:
@@ -143,21 +143,40 @@ custom:
     slimPatternsAppendDefaults: false
     slimPatterns:
       - "**/*.egg-info*"
-```  
-This will remove all folders within the installed requirements that match 
-the names in `slimPatterns`  
-## Omitting Packages 
+```
+This will remove all folders within the installed requirements that match
+the names in `slimPatterns`
+## Omitting Packages
 You can omit a package from deployment with the `noDeploy` option. Note that
-dependencies of omitted packages must explicitly be omitted too.
-By default, this will not install the AWS SDKs that are already installed on
-Lambda. This example makes it instead omit pytest:
+dependencies of omitted packages must explicitly be omitted too. By default,
+the following packages are omitted as they are already installed on Lambda:
+
+ * boto3
+ * botocore
+ * docutils
+ * jmespath
+ * pip
+ * python-dateutil
+ * s3transfer
+ * setuptools
+ * six
+
+This example makes it instead omit pytest:
 ```yaml
 custom:
   pythonRequirements:
     noDeploy:
       - pytest
 ```
 
+To include the default omitted packages, set the `noDeploy` option to an empty
+list:
+```yaml
+custom:
+  pythonRequirements:
+    noDeploy: []
+```
+
 ## 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).
@@ -180,7 +199,7 @@ custom:
     useDownloadCache: true
     cacheLocation: '/home/user/.my_cache_goes_here'
     staticCacheMaxVersions: 10
-      
+
 ```
 
 ### Extra pip arguments

index.js

@@ -69,6 +69,9 @@ class ServerlessPythonRequirements {
     if (options.dockerizePip === 'non-linux') {
       options.dockerizePip = process.platform !== 'linux';
     }
+    if (options.dockerizePip && process.platform === 'win32') {
+      options.pythonBin = 'python';
+    }
     if (
       !options.dockerizePip &&
       (options.dockerSsh || options.dockerImage || options.dockerFile)

test.bats

@@ -8,7 +8,7 @@ setup() {
         export LANG=C.UTF-8
     fi
     export USR_CACHE_DIR=`node -e 'console.log(require("./lib/shared").getUserCachePath())'`
-    # Please note: If you update change the requirements.txt in test/base this value will 
+    # Please note: If you update change the requirements.txt in test/base this value will
     # change.  Run a test which uses this variable manually step by step and list the cache
     # folder to find the new hash if you do this
     if [ -d "${USR_CACHE_DIR}" ] ; then
@@ -71,7 +71,7 @@ teardown() {
     unzip .serverless/sls-py-req-test.zip -d puck
     ls puck/flask
     test $(find puck -name "*.pyc" | wc -l) -eq 0
-    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0  
+    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0
 }
 
 @test "py3.6 doesn't package boto3 by default" {
@@ -143,7 +143,7 @@ teardown() {
     unzip .serverless/sls-py-req-test.zip -d puck
     ls puck/flask
     test $(find puck -name "*.pyc" | wc -l) -eq 0
-    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0  
+    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0
 }
 
 @test "py3.6 uses download cache with useDownloadCache option" {
@@ -279,7 +279,7 @@ teardown() {
 @test "py2.7 can package flask with slim option" {
     cd tests/base
     npm i $(npm pack ../..)
-    sls --runtime=python2.7 --slim=true package 
+    sls --runtime=python2.7 --slim=true package
     unzip .serverless/sls-py-req-test.zip -d puck
     ls puck/flask
     test $(find puck -name "*.pyc" | wc -l) -eq 0
@@ -301,7 +301,7 @@ teardown() {
     unzip .serverless/sls-py-req-test.zip -d puck
     ls puck/flask
     test $(find puck -name "*.pyc" | wc -l) -eq 0
-    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0  
+    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0
 }
 
 @test "py2.7 doesn't package boto3 by default" {
@@ -372,7 +372,7 @@ teardown() {
     unzip .serverless/sls-py-req-test.zip -d puck
     ls puck/flask
     test $(find puck -name "*.pyc" | wc -l) -eq 0
-    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0  
+    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0
 }
 
 @test "pipenv py3.6 can package flask with default options" {
@@ -400,7 +400,7 @@ teardown() {
     unzip .serverless/sls-py-req-test.zip -d puck
     ls puck/flask
     test $(find puck -name "*.pyc" | wc -l) -eq 0
-    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0  
+    test $(find puck -type d -name "*.egg-info*" | wc -l) -eq 0
 }
 
 @test "pipenv py3.6 can package flask with zip option" {