Merge remote-tracking branch 'upstream/master'

Author: cyclimse

.github/workflows/integrate.yml

@@ -117,6 +117,10 @@ jobs:
   linuxNode12:
     name: '[Linux] Node.js v12: Unit tests'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        sls-version: [2, 3]
+        pipenv-version: ['2022.8.5', '2022.8.13']
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -165,10 +169,6 @@ jobs:
   tagIfNewVersion:
     name: Tag if new version
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        sls-version: [2, 3]
-        pipenv-version: ['2022.8.5', '2022.8.13']
     needs: [windowsNode14, linuxNode14, linuxNode12]
     steps:
       - name: Checkout repository

.github/workflows/validate.yml

@@ -16,7 +16,11 @@ jobs:
     strategy:
       matrix:
         sls-version: [2, 3]
-        pipenv-version: ['2022.8.5', '2022.8.13']
+        pipenv-version: ['2022.8.5', '2022.8.13', '2023.7.4', '2023.7.9']
+        # pipenv 2202.8.13 marks deprecation of pipenv lock --requirements
+        # https://github.com/pypa/pipenv/blob/30067b458bd7a429f242736b7fde40c9bd4d4f14/CHANGELOG.rst#2022813-2022-08-13
+        # pipenv 2023.7.9 marks deprecation of pipenv lock --keep-outdated
+        # https://github.com/pypa/pipenv/blob/30067b458bd7a429f242736b7fde40c9bd4d4f14/CHANGELOG.rst#202379-2023-07-09
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -95,7 +99,7 @@ jobs:
     strategy:
       matrix:
         sls-version: [2, 3]
-        pipenv-version: ['2022.8.5', '2022.8.13']
+        pipenv-version: ['2022.8.5', '2022.8.13', '2023.7.4', '2023.7.9']
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -149,7 +153,7 @@ jobs:
     strategy:
       matrix:
         sls-version: [2, 3]
-        pipenv-version: ['2022.8.5', '2022.8.13']
+        pipenv-version: ['2022.8.5', '2022.8.13', '2023.7.4', '2023.7.9']
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

.gitignore

@@ -76,3 +76,6 @@ unzip_requirements.py
 # Project ignores
 puck/
 serverless.yml.bak
+
+# Generated packaging
+*.tgz

.python-version

@@ -0,0 +1 @@
+3.7

CONTRIBUTING.md

@@ -12,9 +12,17 @@ Welcome, and thanks in advance for your help!
 
 ## Setup
 
-It is recommended to use Node v14 or v16 for development.
-
-Then, to begin development fork repository and run `npm install` in its root folder.
+Pre-Reqs:
+* Python 3.7
+* [poetry](https://python-poetry.org/docs/) (if you use multiple versions of Python be sure to install it with python 3.7)
+* Perl (used in the tests)
+* Node v14 or v16
+
+Then, to begin development:
+1. fork the repository
+2. `npm install -g serverless@<VERSION>` (check the peer dependencies in the root `package.json` file for the version)
+3. run `npm install` in its root folder
+4. run the tests via `npm run test`
 
 ## Getting started
 

index.js

@@ -70,6 +70,13 @@ class ServerlessPythonRequirements {
       // "google" and "scaleway" providers' runtimes uses python3XX
       options.pythonBin = options.pythonBin.replace(/3([0-9]+)/, '3.$1');
     }
+    if (
+      options.pythonBin === this.serverless.service.provider.runtime &&
+      !options.pythonBin.startsWith('python')
+    ) {
+      options.pythonBin = 'python';
+    }
+
     if (options.dockerizePip === 'non-linux') {
       options.dockerizePip = process.platform !== 'linux';
     }

lib/pipenv.js

@@ -77,26 +77,36 @@ async function pipfileToRequirements() {
 
     if (semver.gt(pipenvVersion, LEGACY_PIPENV_VERSION)) {
       // Using new pipenv syntax ( >= 2022.8.13)
+      // Generate requirements from existing lock file.
+      // See: https://pipenv.pypa.io/en/latest/advanced/#generating-a-requirements-txt
       try {
-        await spawn('pipenv', ['lock', '--keep-outdated'], {
+        res = await spawn('pipenv', ['requirements'], {
           cwd: this.servicePath,
         });
       } catch (e) {
         const stderrBufferContent =
           (e.stderrBuffer && e.stderrBuffer.toString()) || '';
-        if (stderrBufferContent.includes('must exist to use')) {
+        if (stderrBufferContent.includes('FileNotFoundError')) {
           // No previous Pipfile.lock, we will try to generate it here
+          if (this.log) {
+            this.log.warning(
+              'No Pipfile.lock found! Review https://pipenv.pypa.io/en/latest/pipfile/ for recommendations.'
+            );
+          } else {
+            this.serverless.cli.log(
+              'WARNING: No Pipfile.lock found! Review https://pipenv.pypa.io/en/latest/pipfile/ for recommendations.'
+            );
+          }
           await spawn('pipenv', ['lock'], {
             cwd: this.servicePath,
           });
+          res = await spawn('pipenv', ['requirements'], {
+            cwd: this.servicePath,
+          });
         } else {
           throw e;
         }
       }
-
-      res = await spawn('pipenv', ['requirements'], {
-        cwd: this.servicePath,
-      });
     } else {
       // Falling back to legacy pipenv syntax
       res = await spawn(

test.js

@@ -1655,6 +1655,18 @@ test('poetry py3.7 fails packaging if poetry.lock is missing and flag requirePoe
   t.end();
 });
 
+test('works with provider.runtime not being python', async (t) => {
+  process.chdir('tests/base');
+  const path = npm(['pack', '../..']);
+  npm(['i', path]);
+  sls(['package'], { env: { runtime: 'nodejs12.x' } });
+  t.true(
+    pathExistsSync('.serverless/sls-py-req-test.zip'),
+    'sls-py-req-test is packaged'
+  );
+  t.end();
+});
+
 test('poetry py3.7 packages additional optional packages', async (t) => {
   process.chdir('tests/poetry_packages');
   const path = npm(['pack', '../..']);

tests/base/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.3.1.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-6.0.0.tgz"
   }
 }

tests/individually/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.1.1.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-6.0.0.tgz"
   }
 }

tests/non_build_pyproject/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.3.1.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-6.0.0.tgz"
   }
 }

tests/non_poetry_pyproject/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.3.1.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-6.0.0.tgz"
   }
 }

tests/pipenv/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.3.1.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-6.0.0.tgz"
   }
 }

tests/poetry/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.3.1.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-6.0.0.tgz"
   }
 }

tests/poetry_individually/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "serverless-python-requirements": "file:serverless-python-requirements-5.3.1.tgz"
+    "serverless-python-requirements": "file:serverless-python-requirements-6.0.0.tgz"
   }
 }