Merge branch 'master' into master

Author: bsamuel-ui

README.md

@@ -95,14 +95,8 @@ custom:
 
 
 ## Poetry support :sparkles::pencil::sparkles:
-NOTE: Only poetry version 1 supports the required `export` command for this
-feature. As of the point this feature was added, poetry 1.0.0 was in preview
-and requires that poetry is installed with the --preview flag.
-
-TL;DR Install poetry with the `--preview` flag.
-
 If you include a `pyproject.toml` and have `poetry` installed instead of a `requirements.txt` this will use
-`poetry export --without-hashes -f requirements.txt` to generate them. It is fully compatible with all options such as `zip` and
+`poetry export --without-hashes -f requirements.txt -o requirements.txt` to generate them. It is fully compatible with all options such as `zip` and
 `dockerizePip`. If you don't want this plugin to generate it for you, set the following option:
 ```yaml
 custom:

appveyor.yml

@@ -1,9 +1,9 @@
 version: '{build}'
 init:
-    - cmd: python -m pip install -U pip
-    - cmd: pip install pipenv
-    - cmd: pip install poetry==1.0.0a2
-    - ps: npm i -g serverless
+    - cmd: python3 -m pip install -U pip
+    - cmd: pip3 install pipenv
+    - cmd: pip3 install poetry
+    - cmd: npm i -g serverless
 build: off
 test_script:
     - cmd: >-

circle.yml

@@ -33,13 +33,11 @@ jobs:
           python get-poetry.py --preview --yes
           rm get-poetry.py
       # install nodejs
-      - run: curl -sL https://deb.nodesource.com/setup_6.x | sudo bash - && sudo apt -y install nodejs
+      - run: curl -sL https://deb.nodesource.com/setup_10.x | sudo bash - && sudo apt -y install nodejs
       # install serverless & depcheck
-      - run: npm install -g serverless depcheck
+      - run: npm install -g serverless
       # install deps
       - run: npm i
-      # depcheck
-      - run: depcheck .
       # lint:
       - run: npm run lint
       # test!

lib/pip.js

@@ -119,20 +119,18 @@ function installRequirements(targetFolder, serverless, options) {
   );
 
   const dockerCmd = [];
-  const pipCmd = [
-    options.pythonBin,
-    '-m',
-    'pip',
-    'install'
-  ];
-  
-  if (Array.isArray(options.pipCmdExtraArgs) && options.pipCmdExtraArgs.length > 0) {
+  const pipCmd = [options.pythonBin, '-m', 'pip', '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...

lib/poetry.js

@@ -16,7 +16,14 @@ function pyprojectTomlToRequirements() {
 
   const res = spawnSync(
     'poetry',
-    ['export', '--without-hashes', '-f', 'requirements.txt'],
+    [
+      'export',
+      '--without-hashes',
+      '-f',
+      'requirements.txt',
+      '-o',
+      'requirements.txt'
+    ],
     {
       cwd: this.servicePath
     }

package.json

@@ -2,7 +2,7 @@
   "name": "serverless-python-requirements",
   "version": "5.0.1",
   "engines": {
-    "node": ">=6.0"
+    "node": ">=10.0"
   },
   "description": "Serverless Python Requirements Plugin",
   "author": "United Income <engineering@unitedincome.com>",
@@ -61,7 +61,7 @@
     "lodash.set": "^4.3.2",
     "lodash.uniqby": "^4.0.0",
     "lodash.values": "^4.3.0",
-    "rimraf": "^2.6.2",
+    "rimraf": "^3.0.2",
     "sha256-file": "1.0.0",
     "shell-quote": "^1.6.1"
   },

test.js

@@ -52,7 +52,6 @@ const sls = mkCommand('sls');
 const git = mkCommand('git');
 const npm = mkCommand('npm');
 const perl = mkCommand('perl');
-const poetry = mkCommand('poetry');
 
 const setup = () => {
   removeSync(getUserCachePath());
@@ -1910,17 +1909,3 @@ test(
   },
   { skip: !canUseDocker() }
 );
-
-// From this point on, the version of the poetry is 1.0.0a0
-test('poetry1.0.0a0 py3.6 can package flask with default options', t => {
-  process.chdir('tests/poetry');
-  const path = npm(['pack', '../..']);
-  npm(['i', path]);
-  poetry(['self', 'update', '--preview', '1.0.0a0']);
-  sls(['package']);
-  const zipfiles = listZipFiles('.serverless/sls-py-req-test.zip');
-  t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
-  t.true(zipfiles.includes(`bottle.py`), 'bottle is packaged');
-  t.true(zipfiles.includes(`boto3${sep}__init__.py`), 'boto3 is packaged');
-  t.end();
-});