refactor: Adapt pipenv to modern logs

Author: pgrzesik

lib/pipenv.js

@@ -14,29 +14,48 @@ async function pipfileToRequirements() {
     return;
   }
 
-  this.serverless.cli.log('Generating requirements.txt from Pipfile...');
+  let generateRequirementsProgress;
+  if (this.progress) {
+    generateRequirementsProgress = this.progress.get(
+      'python-generate-requirements-pipfile'
+    );
+    generateRequirementsProgress.update(
+      'Generating requirements.txt from Pipfile',
+      { isMainEvent: true }
+    );
+  } else {
+    this.serverless.cli.log('Generating requirements.txt from Pipfile...');
+  }
 
-  let res;
   try {
-    res = await spawn('pipenv', ['lock', '--requirements', '--keep-outdated'], {
-      cwd: this.servicePath,
-    });
-  } catch (e) {
-    if (
-      e.stderrBuffer &&
-      e.stderrBuffer.toString().includes('command not found')
-    ) {
-      throw new Error(
-        `pipenv not found! Install it with 'pip install pipenv'.`
+    let res;
+    try {
+      res = await spawn(
+        'pipenv',
+        ['lock', '--requirements', '--keep-outdated'],
+        {
+          cwd: this.servicePath,
+        }
       );
+    } catch (e) {
+      if (
+        e.stderrBuffer &&
+        e.stderrBuffer.toString().includes('command not found')
+      ) {
+        throw new Error(
+          `pipenv not found! Install it with 'pip install pipenv'.`
+        );
+      }
+      throw e;
     }
-    throw e;
+    fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
+    fse.writeFileSync(
+      path.join(this.servicePath, '.serverless/requirements.txt'),
+      removeEditableFlagFromRequirementsString(res.stdoutBuffer)
+    );
+  } finally {
+    generateRequirementsProgress && generateRequirementsProgress.remove();
   }
-  fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
-  fse.writeFileSync(
-    path.join(this.servicePath, '.serverless/requirements.txt'),
-    removeEditableFlagFromRequirementsString(res.stdoutBuffer)
-  );
 }
 
 /**

lib/poetry.js

@@ -18,6 +18,10 @@ async function pyprojectTomlToRequirements() {
     generateRequirementsProgress = this.progress.get(
       'python-generate-requirements-toml'
     );
+    generateRequirementsProgress.update(
+      'Generating requirements.txt from "pyproject.toml"',
+      { isMainEvent: true }
+    );
   } else {
     this.serverless.cli.log(
       'Generating requirements.txt from pyproject.toml...'