Missed a bindPath failure.

Remove circle config. Skip DockerizePip tests on windows.

Author: bsamuel-ui

.circleci/config.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on: [push]
+
+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

@@ -46,11 +46,6 @@ jobs:
       - name: Install deps
         run: npm install
 
-      - name: Lint
-        run: npm run ci:lint
-        # Don't run lint a hundred times, also it breaks on windows.
-        if: matrix.python-version == 3.6 && matrix.node-version == 12 && matrix.os == 'ubuntu-latest'
-
       - name: Test
         run: npm run test
         env:

.github/workflows/test.yml

@@ -1,11 +1,11 @@
 # 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)
 
-A Serverless v1.x plugin to automatically bundle dependencies from
+A Serverless v5.x plugin to automatically bundle dependencies from
 `requirements.txt` and make them available in your `PYTHONPATH`.
 
 ## Requires Serverless >= v1.34

README.md

@@ -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

@@ -91,8 +91,18 @@ const teardown = () => {
   removeSync('tests/base with a space');
 };
 
+const testFilter = (() => {
+  const elems = process.argv.slice(2); // skip ['node', 'test.js']
+  if (elems.length) {
+    return desc =>
+      elems.some(text => desc.search(text) != -1) ? tape.test : tape.test.skip;
+  } else {
+    return () => tape.test;
+  }
+})();
+
 const test = (desc, func, opts = {}) =>
-  tape.test(desc, opts, async t => {
+  testFilter(desc)(desc, opts, async t => {
     setup();
     let ended = false;
     try {
@@ -262,7 +272,7 @@ test(
     t.true(zipfiles.includes(`flask${sep}__init__.py`), 'flask is packaged');
     t.end();
   },
-  { skip: !hasPython(3) }
+  { skip: !hasPython(3) || brokenOn('win32') }
 );
 
 test(
@@ -392,7 +402,7 @@ test(
     t.true(zipfiles.includes(`boto3${sep}__init__.py`), 'boto3 is packaged');
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -415,7 +425,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -440,7 +450,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -473,7 +483,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -506,7 +516,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -927,6 +937,20 @@ test(
   { skip: !hasPython(3.6) }
 );
 
+test(
+  'non poetry pyproject.toml without requirements.txt packages handler only',
+  async t => {
+    process.chdir('tests/non_poetry_pyproject');
+    const path = npm(['pack', '../..']);
+    npm(['i', path]);
+    sls(['package']);
+    const zipfiles = await listZipFiles('.serverless/sls-py-req-test.zip');
+    t.true(zipfiles.includes(`handler.py`), 'handler is packaged');
+    t.end();
+  },
+  { skip: !hasPython(3.6) }
+);
+
 test(
   'poetry py3.6 can package flask with default options',
   async t => {
@@ -1163,7 +1187,7 @@ test(
     t.true(zipfiles.includes(`boto3${sep}__init__.py`), 'boto3 is packaged');
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -1287,7 +1311,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -1347,7 +1371,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(2.7) }
+  { skip: !canUseDocker() || !hasPython(2.7) || brokenOn('win32') }
 );
 
 test(
@@ -1975,7 +1999,7 @@ test(
 );
 
 test(
-  'py3.6 uses download cache by defaul option',
+  'py3.6 uses download cache by default',
   async t => {
     process.chdir('tests/base');
     const path = npm(['pack', '../..']);
@@ -2004,7 +2028,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -2024,7 +2048,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -2068,7 +2092,7 @@ test(
     );
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -2173,7 +2197,7 @@ test(
 
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );
 
 test(
@@ -2199,5 +2223,5 @@ test(
 
     t.end();
   },
-  { skip: !canUseDocker() || !hasPython(3.6) }
+  { skip: !canUseDocker() || !hasPython(3.6) || brokenOn('win32') }
 );