Merge branch 'master' into patch-1

Author: bsamuel-ui

.circleci/config.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node-version: [12]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install deps
+        run: npm install
+
+      - name: Lint
+        run: npm run ci:lint

.github/workflows/lint.yml

@@ -0,0 +1,16 @@
+name: Publish
+
+on: [release]
+
+jobs:
+  publish-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          version: 12
+          registry-url: https://registry.npmjs.org/
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.github/workflows/publish.yml

@@ -0,0 +1,55 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        python-version: [3.6, 2.7]
+        node-version: [12]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Set up Node ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Check python version
+        run: |
+          python --version
+
+      - name: Install setuptools
+        run: python -m pip install --force setuptools wheel
+
+      - name: Install pipenv / poetry
+        run: python -m pip install pipenv poetry
+
+      - name: Install serverless
+        run: npm install -g serverless
+
+      - name: Install deps
+        run: npm install
+
+      - name: Test
+        run: npm run test
+        env:
+          LC_ALL: C.UTF-8
+          LANG: C.UTF-8
+        if: matrix.os != 'macOS-latest'
+
+      - name: Test (Mac)
+        run: npm run test
+        env:
+          LC_ALL: en_US.UTF-8
+          LANG: en_US.UTF-8
+        if: matrix.os == 'macOS-latest'

.github/workflows/test.yml

@@ -1,7 +1,7 @@
 # Serverless Python Requirements
 
 [![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)
-[![CircleCI](https://circleci.com/gh/UnitedIncome/serverless-python-requirements.svg?style=shield)](https://circleci.com/gh/UnitedIncome/serverless-python-requirements)
+![Github Actions](https://github.com/UnitedIncome/serverless-python-requirements/workflows/Test/badge.svg)
 [![npm](https://img.shields.io/npm/v/serverless-python-requirements.svg)](https://www.npmjs.com/package/serverless-python-requirements)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 
@@ -180,7 +180,7 @@ custom:
 
 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*`).
+option and glob syntax. These patterns 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
 directory, start your pattern with `**/`.
 

README.md

@@ -73,6 +73,7 @@ function findTestFile(servicePath) {
  * @return {boolean}
  */
 function tryBindPath(serverless, bindPath, testFile) {
+  const debug = process.env.SLS_DEBUG;
   const options = [
     'run',
     '--rm',
@@ -83,13 +84,12 @@ function tryBindPath(serverless, bindPath, testFile) {
     `/test/${testFile}`
   ];
   try {
+    if (debug) serverless.cli.log(`Trying bindPath ${bindPath} (${options})`);
     const ps = dockerCommand(options);
-    if (process.env.SLS_DEBUG) {
-      serverless.cli.log(`Trying bindPath ${bindPath} (${options})`);
-      serverless.cli.log(ps.stdout.trim());
-    }
+    if (debug) serverless.cli.log(ps.stdout.trim());
     return ps.stdout.trim() === `/test/${testFile}`;
   } catch (err) {
+    if (debug) serverless.cli.log(`Finding bindPath failed with ${err}`);
     return false;
   }
 }

lib/docker.js

@@ -444,9 +444,8 @@ function copyVendors(vendorFolder, targetFolder, serverless) {
 function requirementsFileExists(servicePath, options, fileName) {
   if (
     options.usePoetry &&
-    fse.existsSync(
-      path.join(servicePath, 'pyproject.toml') && isPoetryProject(servicePath)
-    )
+    fse.existsSync(path.join(servicePath, 'pyproject.toml')) &&
+    isPoetryProject(servicePath)
   ) {
     return true;
   }

lib/pip.js

@@ -60,7 +60,7 @@ function pyprojectTomlToRequirements() {
   fse.moveSync(
     sourceRequirements,
     path.join(this.servicePath, '.serverless', 'requirements.txt'),
-    { "overwrite": true }
+    { overwrite: true }
   );
 }
 

lib/poetry.js

@@ -44,11 +44,12 @@
     "format": "prettier --write '{.,lib}/*.{js,md}'"
   },
   "devDependencies": {
-    "eslint": "^6.8.0",
+    "eslint": "^5.16.0",
     "prettier": "^1",
     "cross-spawn": "*",
-    "deasync-promise": "*",
-    "tape": "*"
+    "tape": "*",
+    "tape-promise": "*",
+    "lodash": "^4.16.15"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.3",
@@ -69,8 +70,15 @@
   "eslintConfig": {
     "extends": "eslint:recommended",
     "env": {
+      "commonjs": true,
       "node": true,
       "es6": true
+    },
+    "parserOptions": {
+      "ecmaVersion": 2018
+    },
+    "rules": {
+      "no-console": "off"
     }
   },
   "prettier": {