refactor: Adapt pipenv to modern logs

Author: pgrzesik

lib/pipenv.js

@@ -14,31 +14,45 @@ 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...'
+    );
+  }
 
-  const res = spawnSync(
-    'pipenv',
-    ['lock', '--requirements', '--keep-outdated'],
-    {
-      cwd: this.servicePath,
+  try {
+    const res = spawnSync(
+      'pipenv',
+      ['lock', '--requirements', '--keep-outdated'],
+      {
+        cwd: this.servicePath,
+      }
+    );
+    if (res.error) {
+      if (res.error.code === 'ENOENT') {
+        throw new Error(
+          `pipenv not found! Install it with 'pip install pipenv'.`
+        );
+      }
+      throw new Error(res.error);
     }
-  );
-  if (res.error) {
-    if (res.error.code === 'ENOENT') {
-      throw new Error(
-        `pipenv not found! Install it with 'pip install pipenv'.`
-      );
+    if (res.status !== 0) {
+      throw new Error(res.stderr);
     }
-    throw new Error(res.error);
-  }
-  if (res.status !== 0) {
-    throw new Error(res.stderr);
+    fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
+    fse.writeFileSync(
+      path.join(this.servicePath, '.serverless/requirements.txt'),
+      removeEditableFlagFromRequirementsString(res.stdout)
+    );
+  } finally {
+    generateRequirementsProgress && generateRequirementsProgress.remove();
   }
-  fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
-  fse.writeFileSync(
-    path.join(this.servicePath, '.serverless/requirements.txt'),
-    removeEditableFlagFromRequirementsString(res.stdout)
-  );
 }
 
 /**

lib/poetry.js

@@ -17,6 +17,7 @@ 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...'