feat: Ensure support when Pipfile.lock missing

andidev · Oct 23, 2022 · 6576dbc · 6576dbc
1 parent ef4f0cc
commit 6576dbc
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 296 deletions.
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
@@ -48,7 +48,7 @@ jobs:
         run: python -m pip install --force setuptools wheel
 
       - name: Install pipenv / poetry
-        run: python -m pip install pipenv==2022.9.24 poetry
+        run: python -m pip install pipenv poetry
 
       - name: Install serverless
         run: npm install -g serverless@${{ matrix.sls-version }}
@@ -99,7 +99,7 @@ jobs:
         run: python -m pip install --force setuptools wheel
 
       - name: Install pipenv / poetry
-        run: python -m pip install pipenv==2022.9.24 poetry
+        run: python -m pip install pipenv poetry
 
       - name: Install serverless
         run: npm install -g serverless@${{ matrix.sls-version }}
@@ -147,7 +147,7 @@ jobs:
         run: python -m pip install --force setuptools wheel
 
       - name: Install pipenv / poetry
-        run: python -m pip install pipenv==2022.9.24 poetry
+        run: python -m pip install pipenv poetry
 
       - name: Install serverless
         run: npm install -g serverless@${{ matrix.sls-version }}

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -61,7 +61,7 @@ jobs:
         run: python -m pip install --force setuptools wheel
 
       - name: Install pipenv / poetry
-        run: python -m pip install pipenv==2022.9.24 poetry
+        run: python -m pip install pipenv poetry
 
       - name: Install serverless
         run: npm install -g serverless@${{ matrix.sls-version }}
@@ -128,7 +128,7 @@ jobs:
         run: python -m pip install --force setuptools wheel
 
       - name: Install pipenv / poetry
-        run: python -m pip install pipenv==2022.9.24 poetry
+        run: python -m pip install pipenv poetry
 
       - name: Install serverless
         run: npm install -g serverless@${{ matrix.sls-version }}
@@ -181,7 +181,7 @@ jobs:
         run: python -m pip install --force setuptools wheel
 
       - name: Install pipenv / poetry
-        run: python -m pip install pipenv==2022.9.24 poetry
+        run: python -m pip install pipenv poetry
 
       - name: Install serverless
         run: npm install -g serverless@${{ matrix.sls-version }}

diff --git a/lib/pipenv.js b/lib/pipenv.js
@@ -28,26 +28,38 @@ async function pipfileToRequirements() {
   }
 
   try {
-    let res;
     try {
-      res = await spawn('pipenv', ['lock', '--keep-outdated'], {
-        cwd: this.servicePath,
-      });
-      res = await spawn('pipenv', ['requirements', '--hash'], {
+      await spawn('pipenv', ['lock', '--keep-outdated'], {
         cwd: this.servicePath,
       });
     } catch (e) {
-      if (
-        e.stderrBuffer &&
-        e.stderrBuffer.toString().includes('command not found')
-      ) {
+      const stderrBufferContent =
+        (e.stderrBuffer && e.stderrBuffer.toString()) || '';
+      if (stderrBufferContent.includes('must exist to use')) {
+        // No previous Pipfile.lock, we will try to generate it here
+        try {
+          await spawn('pipenv', ['lock'], {
+            cwd: this.servicePath,
+          });
+        } catch (e) {
+          console.log('weird', e.stderrBuffer.toString());
+          throw e;
+        }
+      }
+
+      if (stderrBufferContent.includes('command not found')) {
         throw new this.serverless.classes.Error(
           `pipenv not found! Install it according to the poetry docs.`,
           'PYTHON_REQUIREMENTS_PIPENV_NOT_FOUND'
         );
       }
+
       throw e;
     }
+    const res = await spawn('pipenv', ['requirements'], {
+      cwd: this.servicePath,
+    });
+
     fse.ensureDirSync(path.join(this.servicePath, '.serverless'));
     fse.writeFileSync(
       path.join(this.servicePath, '.serverless/requirements.txt'),

diff --git a/tests/pipenv/Pipfile.lock b/tests/pipenv/Pipfile.lock